diff --git a/doc/qtcreator/images/qtcreator-clang-code-model-build-settings.png b/doc/qtcreator/images/qtcreator-clang-code-model-build-settings.png
index 2aa3e5dc194..c3a0c6b6306 100644
Binary files a/doc/qtcreator/images/qtcreator-clang-code-model-build-settings.png and b/doc/qtcreator/images/qtcreator-clang-code-model-build-settings.png differ
diff --git a/doc/qtcreator/images/qtcreator-clang-code-model-options.png b/doc/qtcreator/images/qtcreator-clang-code-model-options.png
index d29e59397d0..db3d99af6ad 100644
Binary files a/doc/qtcreator/images/qtcreator-clang-code-model-options.png and b/doc/qtcreator/images/qtcreator-clang-code-model-options.png differ
diff --git a/doc/qtcreator/images/qtcreator-clang-tools-diagnostics-configuration.png b/doc/qtcreator/images/qtcreator-clang-tools-diagnostics-configuration.png
new file mode 100644
index 00000000000..7b59ddae47e
Binary files /dev/null and b/doc/qtcreator/images/qtcreator-clang-tools-diagnostics-configuration.png differ
diff --git a/doc/qtcreator/images/qtcreator-diagnostics-configuration.png b/doc/qtcreator/images/qtcreator-diagnostics-configuration.png
index 73c6a7950fa..0a1e5341e75 100644
Binary files a/doc/qtcreator/images/qtcreator-diagnostics-configuration.png and b/doc/qtcreator/images/qtcreator-diagnostics-configuration.png differ
diff --git a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
index 8fe248fa21b..4afb949cf95 100644
--- a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc
@@ -166,7 +166,7 @@
             system to the Clang code model for displaying annotations in the
             code editor.
 
-            \image qtcreator-diagnostics-configuration.png "Diagnostics Configuration dialog"
+            \image qtcreator-clang-tools-diagnostics-configuration.png "Diagnostics Configuration dialog"
 
         \li In the \uicontrol {Clang-Tidy Checks} tab, select
             \uicontrol {Select Checks} to select the checks to perform.
diff --git a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
index 3a6b40c4866..491c53cfd69 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc
@@ -138,7 +138,10 @@
             edit the value for the \uicontrol {Do not index files greater than}
             check box. To index all files, deselect the check box.
 
-        \li Select \uicontrol Manage to specify the Clang checks to perform.
+        \li The \uicontrol {Diagnostic Configuration} field shows the Clang
+            checks to perform. Click the value of the field to open the
+            \uicontrol {Diagnostic Configurations} dialog, where you can
+            select and edit the checks to perform.
 
             \image qtcreator-diagnostics-configuration.png
 
@@ -146,26 +149,18 @@
 
     \section1 Clang Checks
 
-    The predefined configurations perform the following Clang checks:
+    In addition to using the built-in checks, you can select \uicontrol Copy to
+    create copies of them and edit the copies to fit your needs.
 
-    \list
+    \uicontrol {Build-system warnings} displays warnings as specified
+    by the build system.
 
-        \li \uicontrol {Clang-only pedantic checks} uses the \c -Wpendantic
-            option that performs checks as required by strict ISO C and ISO C++.
+    \uicontrol {Checks for questionable constructs} combines the \c -Wall and
+    \c -Wextra checks for easily avoidable questionable constructions and some
+    additional issues.
 
-        \li \uicontrol {Clang-only checks for questionable constructs} combines
-            the \c -Wall and \c -Wextra checks for easily avoidable questionable
-            constructions and some additional issues.
-
-        \li \uicontrol {Clang-only checks for almost everything} uses the
-            \c -Weverything option with negative options to suppress some
-            warnings.
-
-    \endlist
-
-    You can edit the predefined configurations to perform particular checks
-    beginning with \c -W. Each of these checks also has a negative version
-    that begins with \c -Wno.
+    Clang checks begin with \c -W. Each check also has a negative version that
+    begins with \c -Wno.
 
     Keep in mind that some options turn on other options. For more information,
     see \l{https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html}