Merge remote branch 'origin/2.0'

[qt-creator-jp/qt-creator-jp.git] / doc / qtcreator.qdoc

diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 2257ad2..7455ef7 100644 (file)
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -12,7 +12,7 @@
 
     \title Qt Creator Manual
 
-    \section1 Version 2.0 (Beta)
+    \section1 Version 2.0.80
 
     Qt Creator provides integrated tools for both application designers
     and developers to create applications for multiple desktop and mobile device
@@ -845,10 +845,10 @@
     \section1 Using Update Code Model
 
     To refresh the internal information in Qt Creator pertaining to your code,
-    select \gui{Tools} > \gui{C++} > \gui{Update Code Model}.
+    select \gui{Tools} > \gui{C++} > \gui{Update code model}.
 
     \note In Qt Creator indexing updates the code automatically. Use
-    \gui{Update Code Model} only as an emergency command.
+    \gui{Update code model} only as an emergency command.
 
 */
 
@@ -905,7 +905,7 @@
 
     In the \gui{FakeVim} mode, you can run the main editor in a manner similar
     to the Vim editor. To run the editor in the \gui{FakeVim} mode, select
-    \gui{Edit} > \gui{Advanced} > \gui{Use Vim-style Editing} or press
+    \gui{Edit} > \gui{Advanced} > \gui{Use vim-style editing} or press
     \key{Alt+V,Alt+V}.
 
     In the \gui{FakeVim} mode, most keystrokes in the main editor will be
@@ -2049,7 +2049,7 @@
     {Complete Guide to Symbian Signed}.
 
     When you have your own certificate and private key, you can specify them in
-    the \gui{Create SIS Package} step in your build configuration.
+    the \gui{Create sis Package} step in your build configuration.
 
     \image qtcreator-qt4-symbian-signing.png
 
@@ -2217,8 +2217,9 @@
            \gui{Add clean step} and select the type of step you want to add.
 
            By default, custom steps are disabled. Activate custom steps by
-           checking the \gui{Enable custom process step} check-box.
-        \o To remove a clean step, click \gui{Remove Item}.
+           checking the \gui{Enable Custom Process Step} check-box.
+        \o To remove a clean step, click \gui{Remove clean step} and select the
+           step you want to remove.
         \o To change the order of steps, click
            \inlineimage qtcreator-movestep.png
            .
@@ -3012,7 +3013,7 @@
 
     \table
         \row
-            \i  \gui{Stash Snapshot...}
+            \i  \gui{Stash snapshot...}
             \i  Allows you to save a snapshot of your current
                 work under a name for later reference. For example, if you
                 want to try out something and find out later that it does not work,
@@ -3028,7 +3029,7 @@
                 a rebase operation while pulling.
 
         \row
-            \i  \gui{Clean Repository.../Clean Project...}
+            \i  \gui{Clean repository.../Clean project...}
             \i  Collect all files that are not under version control
                 with the exception of patches and project files
                 and show them as a checkable list in a dialog
@@ -3048,7 +3049,7 @@
         \row
             \i  \gui{Stashes...}
             \i  Displays a dialog showing the stashes created by
-                \gui{Stash Snapshot...} with options to restore,
+                \gui{Stash snapshots...} with options to restore,
                 display or delete them.
     \endtable
 */
@@ -3584,7 +3585,7 @@
     \section2 Terminal Mode
 
     To launch the debugger in the terminal mode, select \gui {Projects > Run Settings}
-    and select the \gui {Run in terminal} check box. Then click the
+    and select the \gui {Run in Terminal} check box. Then click the
     \gui {Start Debugging} button for the active project.
 
     \section2 Attach Mode
@@ -4057,7 +4058,7 @@
     To enable Qt's basic objects data display feature:
     \list
        \o  Select \gui Tools > \gui {Options...} > \gui Debugger >
-           \gui{Debugging Helper} and check the \gui{Use Debugging Helper}
+           \gui{Debugging Helper} and check the \gui{Use debugging helper}
            checkbox.
        \o  The \gui{Locals and Watchers} view is reorganized to provide a
            high-level view of the objects.
@@ -4531,7 +4532,7 @@
     specified in the \c CMake project file.
 
     Known issues for the current version can be found
-    \l{Known Issues of version 1.3.84}{here}.
+    \l{Known Issues of version 2.0.80}{here}.
 
 
     \section1 Adding External Libraries to a CMake Project
@@ -5439,7 +5440,7 @@
             \o In the \gui {Configuration name} field, enter a name for
             the connection.
 
-            \o In the \gui {Device type} field, select \gui {Maemo emulator}.
+            \o In the \gui {Device type} field, select \gui {Local simulator}.
 
             \o In the \gui {Authentication type} field, select \gui Password
             for the initial connection.
@@ -6024,7 +6025,7 @@
     \list 1
         \o Select \gui Tools > \gui Options... > \gui Debugger >
            \gui{Debugging Helper}.
-        \o Uncheck the \gui{Use Debugging Helper} checkbox.
+        \o Uncheck the \gui{Use debugging helper} checkbox.
     \endlist
 
 */
@@ -6599,7 +6600,7 @@
     There are some known issues with Qt Creator.
     The development team is aware of them, there is no need to report them as bugs.
 
-    \section1 Known Issues of Version 1.3.84
+    \section1 Known Issues of Version 2.0.80
 
     \list
         \o On Windows, debugging a MinGW-built console application (with \gui{Run in terminal}