diff --git a/doc/qtcreator/images/qtcreator-build-cmake-output.png b/doc/qtcreator/images/qtcreator-build-cmake-output.png
index 88638020652..4311c61249a 100644
Binary files a/doc/qtcreator/images/qtcreator-build-cmake-output.png and b/doc/qtcreator/images/qtcreator-build-cmake-output.png differ
diff --git a/doc/qtcreator/images/qtcreator-cmake-build-settings-initial.png b/doc/qtcreator/images/qtcreator-cmake-build-settings-initial.png
index 0fce3dd7116..ce7f75f881f 100644
Binary files a/doc/qtcreator/images/qtcreator-cmake-build-settings-initial.png and b/doc/qtcreator/images/qtcreator-cmake-build-settings-initial.png differ
diff --git a/doc/qtcreator/images/qtcreator-projects-view-cmake.png b/doc/qtcreator/images/qtcreator-projects-view-cmake.png
deleted file mode 100644
index c3752d345b3..00000000000
Binary files a/doc/qtcreator/images/qtcreator-projects-view-cmake.png and /dev/null differ
diff --git a/doc/qtcreator/images/qtcreator-projects-view-edit.png b/doc/qtcreator/images/qtcreator-projects-view-edit.png
index 3b761ad6a16..f5c1f37f3b8 100644
Binary files a/doc/qtcreator/images/qtcreator-projects-view-edit.png and b/doc/qtcreator/images/qtcreator-projects-view-edit.png differ
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
index 66ae154d58c..16dd3cee47f 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
@@ -135,6 +135,9 @@
     case-sensitivity. Select \uicontrol {Show Non-matching Lines} to
     hide the lines that match the filter.
 
+    Press \key {Ctrl+F} to \l{Finding and Replacing}{search} for a string from
+    the output.
+
     To increase or decrease the output text size, select \inlineimage plus.png
     (\uicontrol {Zoom In}) or \inlineimage minus.png
     (\uicontrol {Zoom Out}), or press \key Ctrl++ or \key Ctrl+-.
@@ -197,5 +200,5 @@
     \image qtcreator-cmake-clean-steps.png
 
     The build errors and warnings are parsed and displayed in the
-    \uicontrol Issues output pane.
+    \l Issues output pane.
 */
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
index da691f6f03a..80f0e326ea8 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
@@ -57,18 +57,19 @@
     a \c CMakeLists.txt configuration file in a project. Project information is
     also automatically refreshed when you build the project.
 
-    The \uicontrol {File System} section in the sidebar \uicontrol Projects view
-    displays information from the file system. \QC cannot determine whether the
-    files are part of the project. For example, header files that \QC finds in
-    the project directories but that are not mentioned in the CMakeLists.txt
-    files are listed here.
+    \image qtcreator-projects-view-edit.png "CMake project in Projects view"
 
-    \image qtcreator-projects-view-cmake.png "File System section in Projects view"
+    If \QC cannot load the CMake project, the \l Projects view shows a
+    \uicontrol {<File System>} project node to avoid scanning the file
+    system and load the project faster. The node shows the same files
+    as the \l {File System} view. Select \uicontrol Build >
+    \uicontrol {Clear CMake Configuration}, and then select \uicontrol Build
+    > \uicontrol {Run CMake} to reconfigure the project.
 
     \section1 Adding CMake Tools
 
     \QC requires CMake's \l{https://cmake.org/cmake/help/latest/manual/cmake-file-api.7.html}
-    {file-based API}.  Please make sure to use CMake version 3.14, or later.
+    {file-based API}, and therefore you'll need CMake version 3.14, or later.
 
     To view and specify settings for CMake:
 
@@ -144,6 +145,8 @@
 
     \endlist
 
+    Warnings and errors are displayed in the \l {Issues} output pane.
+
    \section1 Adding External Libraries to CMake Projects
 
     Through external libraries, \QC can support code completion and syntax