Merge remote-tracking branch 'origin/4.4'

 Conflicts:
	qtcreator.pri

Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba

4 files changed, 35 insertions, 5 deletions

diff --git a/doc/images/qtcreator-refactoring-replace.png b/doc/images/qtcreator-refactoring-replace.png
index 4c62c5f065..d0fa9dec47 100644
--- a/doc/images/qtcreator-refactoring-replace.png
+++ b/doc/images/qtcreator-refactoring-replace.png
diff --git a/doc/images/qtcreator-semanticerror-clang.png b/doc/images/qtcreator-semanticerror-clang.png
new file mode 100644
index 0000000000..9980485832
--- /dev/null
+++ b/doc/images/qtcreator-semanticerror-clang.png
diff --git a/doc/images/qtcreator-syntaxerror-clang.png b/doc/images/qtcreator-syntaxerror-clang.png
new file mode 100644
index 0000000000..8beee1832f
--- /dev/null
+++ b/doc/images/qtcreator-syntaxerror-clang.png
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 9b55aad11a..1c040afe5a 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -187,11 +187,35 @@
 
     \endlist
 
-    In addition, you can run static checks on the QML and JavaScript code in
-    your project to find common problems.
+    When using the Clang code model, errors and warnings are additionally marked
+    with icons and annotated. If a \l{http://clang.llvm.org/diagnostics.html}
+    {Clang fix-it} is available, you can execute it by clicking the
+    \inlineimage refactormarker.png
+    icon and pressing \key Enter.
+
+    In the following figure, a semicolon is missing at the end of the
+    line.
+
+    \image qtcreator-syntaxerror-clang.png
+
+    In the following figure, the variable is not used.
+
+    \image qtcreator-semanticerror-clang.png
+
+    To specify the position where the annotations are displayed, select
+    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Display > \uicontrol {Annotations next to lines}, and then
+    select whether to display the annotations directly next to the code,
+    aligned to the right of the code, or in the right margin.
+
+    If you hide the annotations by deselecting the check box, you can move the
+    mouse pointer over an icon to view them.
 
     \section1 Checking JSON Data Structure
 
+    You can run static checks on the QML and JavaScript code in
+    your project to find common problems.
+
     \QC validates instances of JSON entities against
     \l{http://tools.ietf.org/html/draft-zyp-json-schema-03}
     {A JSON Media Type for Describing the Structure and Meaning of JSON Documents}.
@@ -1956,6 +1980,9 @@
 
     \section1 Renaming Symbols
 
+    You can rename symbols in all files in a project. When you rename a class,
+    you can also change filenames that match the class name.
+
     To rename a specific symbol in a Qt project:
 
     \list 1
@@ -1973,15 +2000,18 @@
             \image qtcreator-refactoring-replace.png
 
         \li To replace all selected instances, enter the name of the new symbol
-            in the \uicontrol {Replace with} text box and click
-            \uicontrol Replace.
+            in the \uicontrol {Replace with} text box.
 
             To omit an instance, uncheck the check-box next to the instance.
 
+        \li If the symbol is a class, select the \uicontrol {Rename files} check
+            box to also change the filenames that match the class name.
+
+        \li  Select \uicontrol Replace.
+
             \note This action replaces all selected instances of the symbol in
             all files listed in the \uicontrol {Search Results} pane. You cannot
             undo this action.
-
     \endlist
 
     \note Renaming local symbols does not open the \uicontrol {Search Results}