diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
index 920bd6d3907..d267eaf8f60 100644
--- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
+++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc
@@ -519,5 +519,5 @@
     The \l {Application Output} view shows some information even if the
     Performance Analyzer displays error messages.
 
-    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}
+    \sa {Analyze}{How To: Analyze}, {Analyzers}, {Analyzing Code}, {Kits}
 */
diff --git a/doc/qtcreator/src/analyze/creator-analyze.qdoc b/doc/qtcreator/src/analyze/creator-analyze.qdoc
index e2333cee77c..982d4219923 100644
--- a/doc/qtcreator/src/analyze/creator-analyze.qdoc
+++ b/doc/qtcreator/src/analyze/creator-analyze.qdoc
@@ -151,5 +151,5 @@
     is especially useful when viewing large trace files that are difficult to
     visualize using the built-in trace-viewer (\c{chrome://tracing}).
 
-    \sa {Analyze}{How To: Analyze}, {Analyzers}
+    \sa {Activate kits for a project}, {Analyze}{How To: Analyze}, {Analyzers}
 */
diff --git a/doc/qtcreator/src/analyze/creator-valgrind.qdoc b/doc/qtcreator/src/analyze/creator-valgrind.qdoc
index d044e581199..dfc43effb49 100644
--- a/doc/qtcreator/src/analyze/creator-valgrind.qdoc
+++ b/doc/qtcreator/src/analyze/creator-valgrind.qdoc
@@ -392,7 +392,7 @@
             \image qtcreator-valgrind-remote-settings.png {Start Remote Analysis dialog}
 
         \li Select the application to run and analyze, as well as the
-            \l{glossary-buildandrun-kit}{kit} to use.
+            \l{Kits}{kit} to use.
 
     \endlist
 
diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc
index ab6ae2d9092..bd9e8be5073 100644
--- a/doc/qtcreator/src/android/androiddev.qdoc
+++ b/doc/qtcreator/src/android/androiddev.qdoc
@@ -149,8 +149,7 @@
     building Qt from \c modules/Core.json and uses it instead of the version
     in \c sdk_definitions.json.
 
-    \sa {Android}{How To: Develop for Android},
-    {Developing for Android}
+    \sa {Android}{How To: Develop for Android}, {Developing for Android}, {Kits}
 */
 
 /*!
diff --git a/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc b/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc
index 8753e838649..2d264f0e57d 100644
--- a/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc
+++ b/doc/qtcreator/src/android/creator-projects-settings-run-android.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for running applications on Android devices.
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
@@ -66,5 +66,5 @@
     \endcode
 
     \sa {Activate kits for a project}, {Configure projects for running},
-    {Android}{How To: Develop for Android}
+    {Android}{How To: Develop for Android}, {Kits}
 */
diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc
index e1b83d5e046..75f497cc6d7 100644
--- a/doc/qtcreator/src/android/deploying-android.qdoc
+++ b/doc/qtcreator/src/android/deploying-android.qdoc
@@ -499,6 +499,6 @@
     To add a permission, select it from the list, and then click \uicontrol Add.
 
     \sa {Build and Run}{How To: Build and Run},
-    {Android}{How To: Develop for Android}, {Android Run Settings}
+    {Android}{How To: Develop for Android}, {Android Run Settings}, {Kits}
 */
 
diff --git a/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc b/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc
index af2ffacaaec..0df58d12e8c 100644
--- a/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc
+++ b/doc/qtcreator/src/appman/creator-appman-how-to-run.qdoc
@@ -153,5 +153,5 @@
     {Remote Linux}{How To: Develop for remote Linux},
     {Run on many platforms}, {Debugging}, {Debuggers}, {Debugger},
     {Developing for \B2Q Devices}, {Developing for Remote Linux Devices},
-    {Profiling QML Applications}
+    {Profiling QML Applications}, {Kits}
 */
diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
index 70ded6fc366..67b73cf9822 100644
--- a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
+++ b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc
@@ -71,7 +71,8 @@
 
     The available settings depend on the debug server provider.
 
-    \sa {Enable and disable plugins}, {Bare Metal}{How To: Develop for Bare Metal}
+    \sa {Add kits}, {Enable and disable plugins},
+    {Bare Metal}{How To: Develop for Bare Metal}
 */
 
 /*!
@@ -296,6 +297,7 @@
     \previouspage creator-how-tos.html
 
     \ingroup creator-how-to-bare-metal
+    \ingroup creator-how-to-manage-kits
 
     \title Add Bare Metal devices
 
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
index aac591854cd..c3b9692c5ae 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
@@ -11,15 +11,15 @@
 
     \brief Settings for building applications with CMake.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
     Configuring medium-sized to large CMake projects in \QC can be a
     challenge due to the number of variables that you need to pass to
     CMake to configure the project correctly. To make this easier,
-    \QC creates an initial configuration for you based on the kit
-    settings and displays it in \uicontrol {Initial Configuration} in
+    \QC creates an initial configuration for you based on the \l{Kits}
+    {kit preferences} and displays it in \uicontrol {Initial Configuration} in
     the \uicontrol {Build Settings} of the project.
     Or, you can use CMake presets to configure CMake.
 
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
index 1cc600123a6..ace6f693895 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
@@ -133,12 +133,13 @@
     \previouspage creator-how-tos.html
 
     \ingroup creator-how-to-build-with-cmake
+    \ingroup creator-how-to-manage-kits
 
     \title Add CMake tools
 
     \QC automatically detects the CMake executable that you specify in the
     \c PATH. You can add paths to other CMake executables and use them in
-    different build and run \l{glossary-buildandrun-kit}{kits}.
+    different build and run \l{Kits}{kits}.
 
     To see the CMake installations that \QC automatically detects:
 
@@ -183,8 +184,8 @@
 
     \image qtcreator-kits-cmake.png {Kits preferences}
 
-    \sa {Build with CMake}{How To: Build with CMake}, {CMake}, {Add kits},
-    {kits-tab}{Kits}
+    \sa {Build with CMake}{How To: Build with CMake},
+    {Manage Kits}{How To: Manage Kits}, {CMake}, {Kits}
 */
 
 /*!
diff --git a/doc/qtcreator/src/conan/creator-projects-conan-building.qdoc b/doc/qtcreator/src/conan/creator-projects-conan-building.qdoc
index 55f71c40d05..81ecd115756 100644
--- a/doc/qtcreator/src/conan/creator-projects-conan-building.qdoc
+++ b/doc/qtcreator/src/conan/creator-projects-conan-building.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for building applications with the Conan package manager.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
@@ -30,5 +30,5 @@
     Select \uicontrol {Build missing} to build packages from source if binary
     packages are not found.
 
-    \sa {Conan Package Manager}
+    \sa {Activate kits for a project}, {Conan Package Manager}
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
index d2836a9c5f5..c726d15e601 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc
@@ -58,7 +58,7 @@
     \endtable
 
     The debugger plugin automatically selects a suitable native debugger for
-    each \l{kits-tab}{kit} from the ones found on the computer. The automatic
+    each \l{Kits}{kit} from the ones found on the computer. The automatic
     setup fails if the native debugger is not installed on the computer or
     if \QC does not support the installed version.
 
@@ -148,5 +148,5 @@
 
     \image qtcreator-run-settings-python.webp {Run settings for a Python project}
 
-    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}, {Kits}
 */
diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
index eee91df904b..25c127aa413 100644
--- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
+++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc
@@ -29,7 +29,7 @@
     \section1 Setting Up the Debugger
 
     The debugger plugin automatically selects a suitable native debugger for
-    each \l{kits-tab}{kit} from the ones found on your system. You can select
+    each \l{Kits}{kit} from the ones found on your system. You can select
     another kit. To specify the debugger and compiler to use for each kit, go to
     \preferences > \uicontrol Kits.
 
@@ -212,7 +212,7 @@
     \l{Debugging a Qt Quick Application}.
 
     \sa {Debugging a C++ Application}, {Debug}{How To: Debug}, {Debuggers},
-    {Debugger}
+    {Debugger}, {Kits}
 */
 
 /*!
@@ -301,7 +301,7 @@
     \title Start and debug an external application
 
     To debug any executable on your local or on a remote
-    machine without using a project, specify a build and run kit that
+    machine without using a project, specify a build and run \l{Kits}{kit} that
     identifies the device to debug the application on.
 
     While the \e{start external} debugger mode does not strictly require a
@@ -342,7 +342,8 @@
             configuration to use.
     \endlist
 
-    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \sa {Activate kits for a project}, {Debug}{How To: Debug}, {Debugging},
+    {Debuggers}, {Debugger}
 */
 
 /*!
@@ -406,7 +407,8 @@
             process to start.
     \endlist
 
-    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \sa {Activate kits for a project}, {Debug}{How To: Debug}, {Debugging},
+    {Debuggers}, {Debugger}
 */
 
 /*!
diff --git a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
index 1d4f41f789e..e44a2f93fc9 100644
--- a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
+++ b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc
@@ -281,6 +281,6 @@
     updated in the running application, but not in the source code.
 
     \if defined(qtcreator)
-    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}
+    \sa {Debug}{How To: Debug}, {Debugging}, {Debuggers}, {Debugger}, {Kits}
     \endif
 */
diff --git a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
index b9b4b1bc735..8d82c2a52a9 100644
--- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
+++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc
@@ -250,8 +250,8 @@
     To disable the embedded code model and use \QMLLS for everything,
     select \uicontrol {Use \QMLLS advanced features}.
 
-    Also, \QC tries to use \QMLLS shipped with
-    the Qt version in your current kit. To override that behavior and always use
+    Also, \QC tries to use \QMLLS shipped with the Qt version in your current
+    \l{Kits}{kit}. To override that behavior and always use
     \QMLLS of the highest registered Qt version, select
     \uicontrol {Use \QMLLS from latest Qt version}.
 
@@ -262,7 +262,7 @@
     > \uicontrol {Initial Configuration}.
 
     \sa {Manage Language Servers}{How To: Manage Language Servers},
-    {Enabling and Disabling Messages}, {CMake Build Configuration},
+    {Enabling and Disabling Messages}, {CMake Build Configuration}, {Kits}
     {Language Servers}
 */
 
diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc
index d19c3e9d8fb..6395da3c317 100644
--- a/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-install.qdoc
@@ -41,7 +41,7 @@
     instructions to install \QC.
 
     To develop with Qt, you also need a Qt version. You can register Qt versions
-    in the stand-alone \QC to use them in \l{kits-tab}{kits}.
+    in the stand-alone \QC to use them in \l{Kits}{kits}.
 
     \section2 Use package managers
 
@@ -89,5 +89,5 @@
     {Compiling \QC} and \l{https://wiki.qt.io/Building_Qt_Creator_from_Git}
     {Building Qt Creator from Git}.
 
-    \sa {Register installed Qt versions}
+    \sa {Manage Kits}{How To: Manage Kits}, {Register installed Qt versions}
 */
diff --git a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
index 967031f69be..8685f850ce4 100644
--- a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
+++ b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
@@ -53,8 +53,8 @@
     This also enables code completion of QML code and removes error messages.
 
     The following example illustrates how to specify the import path for qmake
-    projects so that it works when switching between build and run kits for
-    different target platforms:
+    projects so that it works when switching between build and run \l{Kits}{kits}
+    for different target platforms:
 
     \code
     TEMPNAME = $${QMAKE_QMAKE}
diff --git a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc
index f872adc77e6..f3828018149 100644
--- a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc
+++ b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild-building.qdoc
@@ -10,7 +10,7 @@
 
     \brief Build and clean steps for Incredibuild.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
diff --git a/doc/qtcreator/src/ios/creator-ios-dev.qdoc b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
index f02397f149f..b6c8d53cde9 100644
--- a/doc/qtcreator/src/ios/creator-ios-dev.qdoc
+++ b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
@@ -147,7 +147,8 @@
     If the current device state is \uicontrol Connected, (the traffic light icon is
     orange), you need to configure the device using Xcode.
 
-    \sa {iOS}{How To: Develop for iOS}, {Developing for iOS}
+    \sa {Activate kits for a project}, {iOS}{How To: Develop for iOS},
+    {Developing for iOS}
 */
 
 /*!
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc
index d39f924f046..241b0ce2f34 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-how-to-run-generic-linux.qdoc
@@ -34,6 +34,6 @@
     Debugging works transparently if GDB server is installed on the device and
     it is compatible with the GDB on the host.
 
-    \sa {Remote Linux}{How To: Develop for remote Linux}, {Run on many platforms}, {Compilers},
-    {Embedded Platforms}, {kit-preferences}{Kits}
+    \sa {Remote Linux}{How To: Develop for remote Linux},
+    {Run on many platforms}, {Compilers}, {Embedded Platforms}, {Kits}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc
index a8d3093cfb5..01eb71f171f 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for running applications on \B2Q devices.
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
@@ -25,6 +25,6 @@
     host and on the device.
 
     \sa {\B2Q}{How To: Develop for \B2Q}, {Manage Kits}{How To: Manage Kits},
-    {Configure projects for running}, {kits-tab}{Kits},
+    {Configure projects for running}, {Kits},
     {\B2Q Deploy Configuration}
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc
index adc27d6a93e..37954b8e89a 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for running applications on Linux-based devices.
 
-    Specify run settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify run settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Run >
     \uicontrol {Run Settings}.
 
@@ -37,6 +37,6 @@
     Select the \uicontrol {Forward to local display} check box to show a remotely
     running X11 client on a local display.
 
-    \sa {Activate kits for a project}, {Configure projects for running}, {kits-tab}{Kits},
+    \sa {Activate kits for a project}, {Configure projects for running}, {Kits},
     {Remote Linux}{How To: Develop for remote Linux}
 */
diff --git a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
index 19ba26bdca4..f49e375f617 100644
--- a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
+++ b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
@@ -181,6 +181,7 @@
     \previouspage creator-how-tos.html
 
     \ingroup creator-how-to-mcu
+    \ingroup creator-how-to-manage-kits
 
     \title Manage MCU Kits
 
@@ -209,7 +210,7 @@
     software required for MCU development with the current kit.
 
     \sa {Enable and disable plugins}, {MCUs}{How To: Develop for MCUs},
-    {Developing for MCUs}
+    {Manage Kits}{How To: Manage Kits}, {Developing for MCUs}
 */
 
 /*!
diff --git a/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc b/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
index d0ada5efced..5132adf9dc0 100644
--- a/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
+++ b/doc/qtcreator/src/meson/creator-projects-meson-building.qdoc
@@ -10,7 +10,7 @@
 
     \brief Settings for building applications with Meson.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
diff --git a/doc/qtcreator/src/meson/creator-projects-meson.qdoc b/doc/qtcreator/src/meson/creator-projects-meson.qdoc
index a6418fcc663..4c71fc7e5e8 100644
--- a/doc/qtcreator/src/meson/creator-projects-meson.qdoc
+++ b/doc/qtcreator/src/meson/creator-projects-meson.qdoc
@@ -21,7 +21,7 @@
 
     \QC automatically detects the Meson and Ninja executables specified in the
     \c PATH. You can add paths to other Meson or Ninja executables and use them
-    in different build and run \l{glossary-buildandrun-kit}{kits}.
+    in different build and run \l{Kits}{kits}.
 
     \note Enable the Meson plugin to use it.
 
@@ -54,7 +54,7 @@
 
     \image qtcreator-kits-meson.png "Setting Meson executable in Kit preferences"
 
-    For more information, see \l {kits-tab}{Kits}.
+    For more information, see \l {Kits}.
 
     \section1 Editing Meson Build Descriptions
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
index b2ea02c1280..3e7f74ae75e 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc
@@ -20,7 +20,7 @@
     However, if you install the stand-alone \QC package, build \QC from sources,
     or install several Qt versions, you may need to tell \QC where to find the
     Qt versions and compilers by adding the paths to them and by creating
-    \l{glossary-buildandrun-kit}{kits} that use them.
+    \l{Kits}{kits} that use them.
 
     To make \QC behave more like your favorite code editor or IDE,
     change the preferences for keyboard shortcuts, color schemes, generic
diff --git a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
index e735c95adf0..3504fd1c33d 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc
@@ -50,7 +50,7 @@
             \li \b {\l{Building and Running an Example}}
 
                 To check that \l{https://www.qt.io/download-qt-installer}
-                {\QOI} created \l{glossary-buildandrun-kit}
+                {\QOI} created \l{Kits}
                 {build and run kits}, open an example application and run it.
                 If you have not done so before, go to
                 \l{Building and Running an Example}.
diff --git a/doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
index 1dc1fb0d6b1..16d45c42278 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
@@ -570,7 +570,7 @@
             \li  Open project
             \li  Ctrl+Shift+O
         \row
-            \li  Select the \l{glossary-buildandrun-kit}{kit} to build and run your project with
+            \li  Select the \l{Kits}{kit} to build and run your project with
             \li  Ctrl+T
         \row
             \li  Run
diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
index 127a59cf0d1..d7afb4ee549 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc
@@ -181,7 +181,7 @@
 
     Run and deploy Qt applications that you build for different target
     platforms or with different compilers, debuggers, or Qt versions.
-    \l{glossary-buildandrun-kit}{Kits} define the tools, \l{glossary-device}
+    \l{Kits} define the tools, \l{glossary-device}
     {device} type and other settings to use when building and running your
     project.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc b/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc
index 78eb3ecf689..814189ee7b6 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-build-settings-qmake.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for building applications with qmake.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit}
+    Specify build settings for the selected \l{Kits}{kit}
     in \uicontrol Projects > \uicontrol {Build & Run}
     > \uicontrol Build > \uicontrol {Build Settings}.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-how-to-edit-qbs-profiles.qdoc b/doc/qtcreator/src/projects/creator-only/creator-how-to-edit-qbs-profiles.qdoc
index 60f0d3bb0b1..a5037be5b91 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-how-to-edit-qbs-profiles.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-how-to-edit-qbs-profiles.qdoc
@@ -39,5 +39,5 @@
 
     To remove the selected property, select \uicontrol Remove.
 
-    \sa {Activate kits for a project}, {Add kits}, {kits-tab}{Kits}
+    \sa {Activate kits for a project}, {Add kits}, {Kits}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
index 600b8f30791..eb8e2a14ee1 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc
@@ -51,7 +51,7 @@
             (4) to list examples that you can run on \B2Q devices.
 
         \li In \uicontrol {Configure Project}, select
-            \l{glossary-buildandrun-kit}{kits} for building the example for the
+            \l{Kits}{kits} for building the example for the
             target platforms.
 
             \image qtcreator-configure-project.webp {Configure Project view}
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
index 7cfb8f86e0f..a0189b216ab 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc
@@ -16,7 +16,7 @@
     \title Build for many platforms
 
     You can build applications for many target platforms, or using different
-    compilers, debuggers or Qt versions. \l{glossary-buildandrun-kit}{Kits}
+    compilers, debuggers or Qt versions. \l{Kits}
     define the tools, \l{glossary-device}{device} type, and other settings to use.
 
     By default, when you run the application, you
@@ -34,9 +34,8 @@
     \list 1
 
         \li  Select the \uicontrol {Build and Run Kit Selector} icon or go to
-             \uicontrol Build > \uicontrol {Open Build and Run Kit Selector} to select the
-             build and run \l{glossary-buildandrun-kit}{kit} or an
-             \l{Manage AVDs}{Android device}.
+             \uicontrol Build > \uicontrol {Open Build and Run Kit Selector} to
+             select the build and run kit or an \l{Manage AVDs}{Android device}.
 
             \image qtcreator-kit-selector.webp {Kit selector}
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
index 42cc51bef98..e068ec86d4f 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc
@@ -18,7 +18,7 @@
     You can develop Qt applications on several 32-bit and 64-bit platforms.
     Usually, you can build Qt applications on each platform with GCC, a
     vendor-supplied compiler, or a third party compiler. In \QC, a
-    \l{glossary-buildandrun-kit}{kit} specifies the compiler and other
+    \l{Kits}{kit} specifies the compiler and other
     necessary tools for building an application for and running it on a
     particular platform.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
index 5388f7c6e5d..92858ff6078 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
@@ -63,7 +63,7 @@
 
     To test applications on \l{glossary-device}{devices}, you can install
     toolchains for mobile and embedded development as part of Qt distributions.
-    The installers create \l{glossary-buildandrun-kit}{kits} and specify build
+    The installers create \l{Kits}{kits} and specify build
     and run settings for the installed device types. However, you might need to
     install and configure some additional software on the devices to be able to
     \l{Develop for Devices}{connect} to them from the computer.
@@ -81,7 +81,7 @@
 
     To create a new project, select \uicontrol File > \uicontrol{New Project} and
     select the type of your project. The contents of the wizard dialogs depend
-    on the project type and the \l{glossary-buildandrun-kit}{kits} that you
+    on the project type and the \l{Kits}{kits} that you
     select in the \uicontrol {Kit Selection} dialog. Follow the instructions of
     the wizard.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
index 59db5927051..a99de7c59ab 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc
@@ -21,7 +21,7 @@
     debugger of the low level virtual machine (LLVM) project, LLDB.
 
     The debugger plugin automatically selects a suitable native debugger for
-    each \l{glossary-buildandrun-kit}{kit} from the ones found on your system.
+    each \l{Kits}{kit} from the ones found on your system.
     To override this choice, select \preferences > \uicontrol Kits.
 
     To add debuggers:
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
index 1e2b8ed818a..1237c748443 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-kits.qdoc
@@ -45,7 +45,7 @@
         \li Select \uicontrol Add to start from an empty kit or \uicontrol Clone
             to clone the selected kit and edit its preferences.
             \image qtcreator-kits.png
-        \li Set \l{kits-tab}{kit preferences} according to the build system and
+        \li Set \l{Kits}{kit preferences} according to the build system and
             device type.
 
         \li Select \uicontrol OK to create the kit.
@@ -58,8 +58,7 @@
     choose the kit to use. To set the selected kit as the default kit,
     select \uicontrol {Make Default}.
 
-    \sa {Activate kits for a project}, {Add debuggers}, {Add Qt versions},
-    {Open projects}, {Compilers}, {kits-tab}{Kits}
+    \sa {Manage Kits}{How To: Manage Kits}, {Compilers}, {Kits}
 */
 
 /*!
@@ -214,7 +213,6 @@
             \uicontrol Manage to add installed Ninja tools to the list.
     \endtable
 
-    \sa {Activate kits for a project}, {Open projects}, {Add CMake Tools},
-    {Add compilers}, {Add debuggers}, {Add kits}, {Add Qt versions},
+    \sa {Manage Kits}{How To: Manage Kits}, {Add CMake Tools},
     {Edit Qbs profiles}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc
index c85da814661..a01c06b6559 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc
@@ -20,7 +20,7 @@
     \note Enable the Nim plugin to use Nimble and Nim.
 
     In addition, you have to download and install Nim and set up a
-    \l {glossary-buildandrun-kit}{kit} that contains the Nim compiler.
+    \l {Kits}{kit} that contains the Nim compiler.
 
     You can use wizards to create Nim and Nimble projects.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
index 66b69a573fe..67fc416ee7a 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc
@@ -13,6 +13,7 @@
     \previouspage creator-how-tos.html
 
     \ingroup creator-how-to-projects-configure
+    \ingroup creator-how-to-manage-kits
 
     \title Open projects
 
@@ -64,7 +65,7 @@
 
     \list 1
         \li In \uicontrol {Configure Project}, select
-            \l{glossary-buildandrun-kit}{kits} for building
+            \l{Kits}{kits} for building
             and running your project.
             \image qtcreator-configure-project.webp {Configure Project view}
         \li Select \uicontrol {Configure Project}.
@@ -112,5 +113,5 @@
     later. Select the \inlineimage icons/pin.png
     (\uicontrol Pin) button to pin the progress bar back to the toggle button.
 
-    \sa {Activate kits for a project}, {Add kits}, {kits-tab}{Kits},
+    \sa {Manage Kits}{How To: Manage Kits}, {Kits},
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
index b177af0b8d5..0c33472862d 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for building applications with Qbs.
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
index b3ababb5fbf..644b30ac3b1 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc
@@ -16,7 +16,7 @@
 
     \title Configure projects for building
 
-    Specify build settings for the selected \l{glossary-buildandrun-kit}{kit} in
+    Specify build settings for the selected \l{Kits}{kit} in
     \uicontrol Projects > \uicontrol {Build & Run} > \uicontrol Build >
     \uicontrol {Build Settings}.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
index 3f8e93f1421..75544e47e80 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc
@@ -16,7 +16,7 @@
 
     When you install Qt for a development or target platform, such as Linux,
     \macos, Windows, Android or QNX, \l{https://www.qt.io/download-qt-installer}
-    {\QOI} creates \l{glossary-buildandrun-kit}{kits} for the development targets.
+    {\QOI} creates \l{Kits}{kits} for the development targets.
 
     Select the kits to use for a project in the \uicontrol {Configure Projects}
     view when you open the project for the first time. At least one kit must be
@@ -65,7 +65,7 @@
     \section1 Specifying Run Settings
 
     The run settings to specify depend on the type of the project and on the
-    \l{kits-tab}{Run device} that you select for the kit.
+    \l{Kits}{Run device} that you select for the kit.
 
     \QC automatically creates deploy and run configurations for your project.
 
@@ -112,6 +112,7 @@
     \previouspage creator-how-tos.html
 
     \ingroup creator-how-to-projects-configure
+    \ingroup creator-how-to-manage-kits
 
     \title Activate kits for a project
 
@@ -175,5 +176,5 @@
     might still see them listed for existing projects. You can copy the build,
     deploy, and run steps from them to other kits.
 
-    \sa {Add kits}, {Configuring Projects}, {kits-tab}{Kits}
+    \sa {Manage Kits}{How To: Manage Kits}, {Configuring Projects}, {Kits}
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc
index 99802a720b6..9c1463f2d9b 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdoc
@@ -9,7 +9,7 @@
 
     \title Specify Valgrind settings for a project
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc
index b0609ab7716..486b8b8c4c5 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-debug.qdoc
@@ -10,7 +10,7 @@
 
     \title Enable debugging
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc
index 72085701e16..35188f5ce94 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-desktop.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for running applications on desktop device types.
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
index bf816f43511..f989924d560 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc
@@ -16,7 +16,7 @@
 
     \title Configure projects for running
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
diff --git a/doc/qtcreator/src/projects/creator-projects-running.qdoc b/doc/qtcreator/src/projects/creator-projects-running.qdoc
index 1dd25de23a0..f83a9c00ba7 100644
--- a/doc/qtcreator/src/projects/creator-projects-running.qdoc
+++ b/doc/qtcreator/src/projects/creator-projects-running.qdoc
@@ -28,7 +28,7 @@
 
         \li Select the \uicontrol {Build and Run Kit Selector} icon or go to
             \uicontrol Build > \uicontrol {Open Build and Run Kit Selector} to select the
-            build and run \l{glossary-buildandrun-kit}{kit}.
+            build and run \l{Kits}{kit}.
 
             \image qtcreator-kit-selector.webp {Kit selector}
 
diff --git a/doc/qtcreator/src/python/creator-python-development.qdoc b/doc/qtcreator/src/python/creator-python-development.qdoc
index 8978c09d609..ba8053c3d3d 100644
--- a/doc/qtcreator/src/python/creator-python-development.qdoc
+++ b/doc/qtcreator/src/python/creator-python-development.qdoc
@@ -74,7 +74,7 @@
 
     \section1 Select the Python version
 
-    The \l{kits-tab}{kits} you select for the project in \uicontrol Projects >
+    The \l{Kits}{kits} you select for the project in \uicontrol Projects >
     \uicontrol {Build & Run} set the Python version to use.
 
     The \l {Edit Mode}{Edit mode} toolbar shows the current Python version.
diff --git a/doc/qtcreator/src/python/creator-python-run-settings.qdoc b/doc/qtcreator/src/python/creator-python-run-settings.qdoc
index 6c6c3b4fe2b..07cf625450d 100644
--- a/doc/qtcreator/src/python/creator-python-run-settings.qdoc
+++ b/doc/qtcreator/src/python/creator-python-run-settings.qdoc
@@ -31,7 +31,7 @@
 
     \brief Settings for running Qt for Python applications.
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
diff --git a/doc/qtcreator/src/qnx/creator-projects-settings-run-qnx.qdoc b/doc/qtcreator/src/qnx/creator-projects-settings-run-qnx.qdoc
index 4e39314d8f5..edd78c0a193 100644
--- a/doc/qtcreator/src/qnx/creator-projects-settings-run-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-projects-settings-run-qnx.qdoc
@@ -11,7 +11,7 @@
 
     \brief Settings for running applications on Linux-based devices.
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
diff --git a/doc/qtcreator/src/qtquick/creator-only/creator-projects-settings-run-qtquick.qdoc b/doc/qtcreator/src/qtquick/creator-only/creator-projects-settings-run-qtquick.qdoc
index 3f2ee989012..1d7be468c7b 100644
--- a/doc/qtcreator/src/qtquick/creator-only/creator-projects-settings-run-qtquick.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/creator-projects-settings-run-qtquick.qdoc
@@ -11,11 +11,11 @@
 
     \brief Settings for running Qt Quick UI Prototype projects (.qmlproject).
 
-    Specify settings for running applications on the \l {kits-tab}{Run device} that
+    Specify settings for running applications on the \l {Kits}{Run device} that
     you select for a kit in \uicontrol Projects > \uicontrol {Build & Run} >
     \uicontrol Run > \uicontrol {Run Settings}.
 
-    \note Select the \uicontrol Desktop device type for the \l{kits-tab}{Run device}
+    \note Select the \uicontrol Desktop device type for the \l{Kits}{Run device}
     in the kit.
 
     \image qtquick-ui-prototype-run-settings.webp {Run Settings for a Qt Quick UI Prototype project}
@@ -42,5 +42,5 @@
     \endtable
 
     \sa {Create Qt Quick UI Prototypes}, {Activate kits for a project},
-    {Configure projects for running}, {kits-tab}{Kits}
+    {Configure projects for running}, {Kits}
 */
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
index 0fbb4fdea07..f7181c59cf1 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
@@ -76,12 +76,12 @@
         \li Select \uicontrol Next to open the \uicontrol {Kit Selection}
             dialog.
 
-        \li Select \l{glossary-buildandrun-kit}{kits} for the platforms that
+        \li Select \l{Kits}{kits} for the platforms that
             you want to build the application for.
 
             \note Kits are listed if they have been specified in \preferences >
             \uicontrol Kits.
-            For more information, see \l {Add kits} and \l {kits-tab}{Kits}.
+            For more information, see \l {Add kits} and \l {Kits}.
 
         \li Select \uicontrol Next to open the \uicontrol {Project Management}
             dialog.
@@ -161,12 +161,11 @@
         \li Select \uicontrol Next to open the \uicontrol {Kit Selection}
             dialog.
 
-        \li Select \l{glossary-buildandrun-kit}{kits} for the platforms that
+        \li Select \l{Kits}{kits} for the platforms that
             you want to build the application for.
 
             \note Kits are listed if they have been specified in \preferences >
             \uicontrol Kits.
-            For more information, see \l {Add kits} and \l {kits-tab}{Kits}.
 
         \li Select \uicontrol Next to open the \uicontrol {Project Management}
             dialog.
@@ -197,5 +196,6 @@
     To use JavaScript and image files in the application, copy them to the
     project folder.
 
-    \sa {Create Qt Quick Applications}, {Creating Projects}
+    \sa {Create Qt Quick Applications}, {Manage Kits}{How To: Manage Kits},
+    {Creating Projects}
 */
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
index be0c55516a9..22d887c161c 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
@@ -37,14 +37,14 @@
 
         \li Select \uicontrol Next to open the \uicontrol {Kit Selection} dialog.
 
-        \li Select Qt 6.4 or later \l{glossary-buildandrun-kit}{kits} for the
+        \li Select Qt 6.4 or later \l{Kits}{kits} for the
             platforms that you want to build the application for. To build
             applications for mobile devices, select kits also for Android and
             iOS.
 
             \note The list shows kits that you specify in \preferences >
             \uicontrol Kits.
-            For more information, see \l {Add kits} and \l {kits-tab}{Kits}.
+            For more information, see \l {Add kits} and \l {Kits}.
 
         \li Select \uicontrol Next to open the \uicontrol {Project Management}
             dialog.
diff --git a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
index b22bd5be5e7..eb74c5b547d 100644
--- a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
@@ -37,7 +37,7 @@
         \li Set up QML debugging for the project. For more information, see
             \l{Setting Up QML Debugging}.
         \if defined(qtcreator)
-        \li In the \uicontrol Projects mode, select a \l{glossary-buildandrun-kit}
+        \li In the \uicontrol Projects mode, select a \l{Kits}
             {kit} with Qt version 4.7.4 or later.
        \endif
             \note To profile applications on \l{glossary-device}{devices}, you
diff --git a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc
index 0381320085f..5116000256c 100644
--- a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc
@@ -294,6 +294,6 @@
 
     \sa {View output}
     \if defined(qtcreator)
-    \sa {Add custom output parsers}
+    \sa {Add custom output parsers}, {Kits}
     \endif
 */
diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc
index 9794667f5b3..b6a4686f473 100644
--- a/doc/qtcreator/src/user-interface/creator-ui.qdoc
+++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc
@@ -33,7 +33,7 @@
     \row
         \li \inlineimage numbers/02.png
         \li Kit selector
-        \li Select the appropriate \l{glossary-buildandrun-kit}{kit} for building
+        \li Select the appropriate \l{Kits}{kit} for building
             the project and running it on particular hardware.
         \li \l{Activate kits for a project}
     \row
diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
index 8f744bced05..4596d46da2e 100644
--- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
+++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc
@@ -76,7 +76,7 @@
 
             \image qtcreator-new-project-qt-versions-qt-gui.png {Kit Selection dialog}
 
-        \li Select build and run \l{glossary-buildandrun-kit}{kits} for your
+        \li Select build and run \l{Kits}{kits} for your
             project.
 
         \li Select \uicontrol Next or \uicontrol Continue to open the