diff --git a/doc/src/projects/creator-projects-compilers.qdoc b/doc/src/projects/creator-projects-compilers.qdoc
index 91185f6acf8..7ab2957bc2a 100644
--- a/doc/src/projects/creator-projects-compilers.qdoc
+++ b/doc/src/projects/creator-projects-compilers.qdoc
@@ -26,7 +26,7 @@
     \contentspage index.html
     \previouspage creator-project-qmake.html
     \page creator-tool-chains.html
-    \nextpage creator-run-settings.html
+    \nextpage creator-build-settings.html
 
     \title Adding Compilers
 
diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc
index 09dd42c6d4c..38b66eb5263 100644
--- a/doc/src/projects/creator-projects-settings-build.qdoc
+++ b/doc/src/projects/creator-projects-settings-build.qdoc
@@ -24,9 +24,9 @@
 
 /*!
     \contentspage index.html
-    \previouspage creator-configuring-projects.html
+    \previouspage creator-tool-chains.html
     \page creator-build-settings.html
-    \nextpage creator-targets.html
+    \nextpage creator-run-settings.html
 
     \title Specifying Build Settings
 
@@ -192,14 +192,4 @@
     compilers and tools need. Therefore, the environment is never totally empty,
     even after you clear it.
 
-    \section1 Related Topics
-
-    \list
-
-        \li \l{Adding Kits}
-        \li \l{Adding Qt Versions}
-        \li \l{Adding Compilers}
-
-    \endlist
-
 */
diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-projects-settings-overview.qdoc
index 2441c1e42c6..c4af7d70730 100644
--- a/doc/src/projects/creator-projects-settings-overview.qdoc
+++ b/doc/src/projects/creator-projects-settings-overview.qdoc
@@ -26,7 +26,7 @@
     \contentspage index.html
     \previouspage creator-version-control.html
     \page creator-configuring-projects.html
-    \nextpage creator-build-settings.html
+    \nextpage creator-targets.html
 
     \title Configuring Projects
 
@@ -41,11 +41,34 @@
     open projects and use the \gui Build menu commands to build, deploy, and
     run projects.
 
+    \section1 Selecting Kits
+
+    \image qtcreator-project-targets.png
+
+    To add kits for the project, select \gui {Add Kit}. The list displays kits
+    that are configured in \gui Tools > \gui Options > \gui {Build & Run} >
+    \gui Kits. To add kits to the list, select \gui {Manage Kits}.
+    For more information about adding kits, see \l{Adding Kits}.
+
+    Each kit consists of a set of values that define one environment, such as a
+    device, compiler, and Qt version. For more information, see
+    \l{Adding Qt Versions} and \l{Adding Compilers}.
+
+    To copy the build and run settings for a kit to another kit, select
+    \gui {Copy to Kit} in the kit menu.
+
+    To change the kit, while preserving the build and run settings, select
+    \gui {Change Kit}.
+
+    To remove a kit, select \gui {Remove Kit}.
+
+    \section1 Specifying Settings
+
     The project pane consists of the following tabs:
 
     \list
 
-        \li \l{Adding Kits}{Build & Run}
+        \li Build & Run
 
             \list
 
@@ -73,20 +96,4 @@
     If you have multiple projects open in \QC, use the tabs at the top of the
     window to navigate between their settings.
 
-    \section1 Selecting Kits
-
-    \image qtcreator-project-targets.png
-
-    To add kits for the project, select \gui {Add Kit}. The list displays kits
-    that are configured in \gui Tools > \gui Options > \gui {Build & Run} >
-    \gui Kits. To add kits to the list, select \gui {Manage Kits}.
-
-    To copy the build and run settings for a kit to another kit, select
-    \gui {Copy to Kit} in the kit menu.
-
-    To change the kit, while preserving the build and run settings, select
-    \gui {Change Kit}.
-
-    To remove a kit, select \gui {Remove Kit}
-
 */
diff --git a/doc/src/projects/creator-projects-settings-run.qdoc b/doc/src/projects/creator-projects-settings-run.qdoc
index 815aa075436..eff58304f25 100644
--- a/doc/src/projects/creator-projects-settings-run.qdoc
+++ b/doc/src/projects/creator-projects-settings-run.qdoc
@@ -24,7 +24,7 @@
 
 /*!
     \contentspage index.html
-    \previouspage creator-tool-chains.html
+    \previouspage creator-build-settings.html
     \page creator-run-settings.html
     \nextpage creator-editor-settings.html
 
diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc
index f3e32720f53..553a72467e6 100644
--- a/doc/src/projects/creator-projects-targets.qdoc
+++ b/doc/src/projects/creator-projects-targets.qdoc
@@ -24,7 +24,7 @@
 
 /*!
     \contentspage index.html
-    \previouspage creator-build-settings.html
+    \previouspage creator-configuring-projects.html
     \page creator-targets.html
     \nextpage creator-project-qmake.html
 
diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
index 962f86606d6..dae5b27b97d 100644
--- a/doc/src/qtcreator.qdoc
+++ b/doc/src/qtcreator.qdoc
@@ -165,12 +165,10 @@
             \li \l{Using Version Control Systems}
             \li \l{Configuring Projects}
             \list
+                \li \l{Adding Kits}
+                \li \l{Adding Qt Versions}
+                \li \l{Adding Compilers}
                 \li \l{Specifying Build Settings}
-                \list
-                    \li \l{Adding Kits}
-                    \li \l{Adding Qt Versions}
-                    \li \l{Adding Compilers}
-                \endlist
                 \li \l{Specifying Run Settings}
                 \li \l{Specifying Editor Settings}
                 \li \l{Specifying Code Style Settings}