diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc index 71fc6cbf414..a7ddfd10c17 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-settings.qdoc @@ -240,7 +240,7 @@ \li \uicontrol {Use CDB console} \li If a console application does not start up properly in the configured console and the subsequent attach fails, diagnose the issue by - using CDB's native console. Select this checkbox to override the + using the native CDB console. Select this checkbox to override the console set in the Windows system environment variables. Note that the native console does not prompt on application exit. \row diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc index 3f1cebc49ac..aa30b21d381 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc @@ -282,7 +282,7 @@ If a console application does not start up properly in the configured console and the subsequent attach fails, you can diagnose the issue by - using CDB's native console. Go to \preferences > + using the native CDB console. Go to \preferences > \uicontrol Debugger > \uicontrol CDB > \uicontrol {Use CDB console} to override the console set in the Windows system environment variables. Note that the native console does not prompt on application exit. diff --git a/doc/qtcreator/src/editors/creator-only/creator-cpp-quick-fixes.qdoc b/doc/qtcreator/src/editors/creator-only/creator-cpp-quick-fixes.qdoc index 011ea869b2e..7ce6de9a9e1 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-cpp-quick-fixes.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-cpp-quick-fixes.qdoc @@ -461,7 +461,7 @@ \inlineimage icons/refactormarker.png \row \li Convert Function Call to Qt Meta-Method Invocation - \li Converts an invokable function call into a meta method + \li Converts an invocable function call into a meta method invocation. This applies to signals and slots in general, as well as functions explicitly marked with \c Q_INVOKABLE. For example, for the following class: @@ -499,7 +499,7 @@ } \endcode - The quick fix also works on invokable methods outside the class that are + The quick fix also works on invocable methods outside the class that are visible from the location where they are called from. For example, it rewrites diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc index e422b7b3e1d..9ad8d396a78 100644 --- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc +++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc @@ -369,7 +369,7 @@ \li \l {git branch} \row \li \uicontrol {Copy } - \li Copy the commit's to the clipboard. + \li Copy the commit to the clipboard. \li \row \li \uicontrol {Describe Change } @@ -1005,7 +1005,7 @@ In the \uicontrol {Git Branches} view, right-click a remote branch, and then select a merge option in the context menu. If the commit you are merging - can be reached by following the first commit's history, there is no divergent + can be reached by following the history of the first commit, there is no divergent work to merge together. To allow Git to move the branch pointer forward, select \uicontrol {Merge into (Fast-Forward)}. If you do not want to fast-forward the branch, select