Doc: Use "remote Linux" instead of "generic remote Linux"

- Reflect the term changes in the UI.
- Move info about SSH port property to the wizard step list.
- Make the topic names in "Deploying to Devices" shorter.
- Remove some unnecessary "if defined(qtdesignstudio)" conditions
  from topics that are not used in the QDS Manual.

Task-number: QTCREATORBUG-27876
Change-Id: I2282257f245c31af82a41ea0e533407bf1cbd775
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: hjk <hjk@qt.io>

27 files changed, 81 insertions, 98 deletions

diff --git a/doc/qtcreator/images/qtcreator-generic-linux-device-key-deployment.png b/doc/qtcreator/images/qtcreator-generic-linux-device-key-deployment.png
deleted file mode 100644
index cea3c218d4..0000000000
--- a/doc/qtcreator/images/qtcreator-generic-linux-device-key-deployment.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-linux-device-configurations.png b/doc/qtcreator/images/qtcreator-linux-device-configurations.png
deleted file mode 100644
index 58d4362da1..0000000000
--- a/doc/qtcreator/images/qtcreator-linux-device-configurations.png
+++ /dev/null
diff --git a/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux-connection.webp b/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux-connection.webp
new file mode 100644
index 0000000000..5313f254f6
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux-connection.webp
diff --git a/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux-key-deployment.webp b/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux-key-deployment.webp
new file mode 100644
index 0000000000..eac14f341c
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux-key-deployment.webp
diff --git a/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux.webp b/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux.webp
new file mode 100644
index 0000000000..a7fcb124ad
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-preferences-devices-remote-linux.webp
diff --git a/doc/qtcreator/images/qtcreator-screenshot-devconf-linux.png b/doc/qtcreator/images/qtcreator-screenshot-devconf-linux.png
deleted file mode 100644
index fa76062961..0000000000
--- a/doc/qtcreator/images/qtcreator-screenshot-devconf-linux.png
+++ /dev/null
diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc
index b0f7123eef..6d716531ab 100644
--- a/doc/qtcreator/src/android/androiddev.qdoc
+++ b/doc/qtcreator/src/android/androiddev.qdoc
@@ -216,7 +216,7 @@
     To start an AVD, select \uicontrol {Start AVD}. Usually, you don't need to
     start AVDs separately because they are automatically started when you
     select them in the \l{Building for Multiple Platforms}{kit selector} to
-    \l{Deploying Applications to Android Devices}{deploy applications} to them.
+    \l{Deploying to Android}{deploy applications} to them.
 
     To remove an AVD from the list and the kit selector, select
     \uicontrol {Erase AVD}.
diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc
index cb90091da6..3fb8735f7c 100644
--- a/doc/qtcreator/src/android/deploying-android.qdoc
+++ b/doc/qtcreator/src/android/deploying-android.qdoc
@@ -6,7 +6,7 @@
     \page creator-deploying-android.html
     \nextpage creator-deployment-b2qt.html
 
-    \title Deploying Applications to Android Devices
+    \title Deploying to Android
 
     On Android, applications are distributed in specially structured types of
     ZIP packages called Application Packages (APK) or Android App Bundles (AAB).
diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
index c6eefa5db2..53ac406590 100644
--- a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
+++ b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc
@@ -176,6 +176,6 @@
         \li \l {Opening Projects}
         \li \l {CMake Build Configuration}
         \li \l {Specifying Run Settings}
-        \li \l {Deploying Applications to Generic Remote Linux Devices}
+        \li \l {Deploying to Remote Linux}
     \endlist
 */
diff --git a/doc/qtcreator/src/docker/creator-docker.qdoc b/doc/qtcreator/src/docker/creator-docker.qdoc
index e3cfc5c9ff..d0123a2cdd 100644
--- a/doc/qtcreator/src/docker/creator-docker.qdoc
+++ b/doc/qtcreator/src/docker/creator-docker.qdoc
@@ -4,7 +4,7 @@
     /*!
     \page creator-adding-docker-devices.html
     \previouspage creator-developing-b2qt.html
-    \nextpage creator-developing-generic-linux.html
+    \nextpage creator-developing-ios.html
 
     \title Adding Docker Devices
 
diff --git a/doc/qtcreator/src/ios/creator-ios-dev.qdoc b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
index 673ff93926..579e065174 100644
--- a/doc/qtcreator/src/ios/creator-ios-dev.qdoc
+++ b/doc/qtcreator/src/ios/creator-ios-dev.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
     /*!
-    \previouspage creator-developing-generic-linux.html
+    \previouspage creator-adding-docker-devices.html
     \page creator-developing-ios.html
     \nextpage creator-developing-mcu.html
 
diff --git a/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc b/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc
index 2e6eb9a555..73301bb173 100644
--- a/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-deployment-b2qt.qdoc
@@ -4,9 +4,9 @@
 /*!
     \page creator-deployment-b2qt.html
     \previouspage creator-deploying-android.html
-    \nextpage creator-deployment-embedded-linux.html
+    \nextpage creator-deployment-qnx.html
 
-    \title Deploying Applications to Boot2Qt Devices
+    \title Deploying to Boot2Qt
 
     You can specify settings for deploying applications to \l{Boot2Qt} devices
     in the project configuration file and in \uicontrol Projects >
@@ -15,7 +15,7 @@
     \image qtcreator-boot2qt-deployment-steps.png "Boot2Qt deployment steps"
 
     The deployment process is described in more detail in
-    \l{Deploying Applications to Generic Remote Linux Devices}.
+    \l{Deploying to Remote Linux}.
 
     \section1 Launching Applications on Boot
 
diff --git a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
index aaab690366..0944c02a95 100644
--- a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc
@@ -9,20 +9,16 @@
 
 /*!
     \page creator-deployment-embedded-linux.html
-    \previouspage creator-deployment-b2qt.html
-    \if defined(qtdesignstudio)
+    \previouspage creator-deployment-qnx.html
     \nextpage creator-connecting-mobile.html
-    \else
-    \nextpage creator-deployment-qnx.html
-    \endif
 
-    \title Deploying Applications to Generic Remote Linux Devices
+    \title Deploying to Remote Linux
 
     You can specify settings for deploying applications to generic remote
     Linux devices in the project configuration file and in the
     \uicontrol Projects mode, in \uicontrol {Run Settings}.
 
-    \image qtcreator-embedded-linux-deployment-details.png "Deploy to embedded Linux"
+    \image qtcreator-embedded-linux-deployment-details.png "Deploy to remote Linux devices"
 
     The files to be installed are listed in the \uicontrol {Deployment} step,
     the \uicontrol {Files to deploy} field. The \uicontrol {Source File Path}
diff --git a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc
index 493d70302b..cbca285cf6 100644
--- a/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc
+++ b/doc/qtcreator/src/linux-mobile/creator-embedded-platforms.qdoc
@@ -13,7 +13,7 @@
     \list
         \li \l {Bare Metal}
         \li \l {Boot2Qt}
-        \li \l {Generic Remote Linux}
+        \li \l {Remote Linux}
         \li \l {Microcontroller Units (MCU)}
         \li \l QNX
     \endlist
@@ -31,7 +31,7 @@
     \section1 Bare Metal
 
     You can run and debug applications on small devices that are not supported
-    by the generic remote Linux device plugin by using GDB or a hardware
+    by the remote Linux device plugin by using GDB or a hardware
     debugger.
 
     For more information about developing applications for Bare Metal devices,
@@ -56,24 +56,24 @@
             {Boot2Qt: Installation Guides}
         \li \l{Connecting Boot2Qt Devices}
         \li \l{Specifying Run Settings for Boot2Qt Devices}
-        \li \l{Deploying Applications to Boot2Qt Devices}
+        \li \l{Deploying to Boot2Qt}
         \li \l{https://doc.qt.io/qtcreator/creator-overview-qtasam.html}
             {Qt Creator Plugin for Qt Application Manager}
     \endlist
 
-    \section1 Generic Remote Linux
+    \section1 Remote Linux
 
     You must have a tool chain for building applications for embedded Linux
     devices installed on the development PC.
 
     The following topics contain more information about developing applications
-    for generic remote Linux devices:
+    for remote Linux devices:
 
     \list
-        \li \l{Connecting Generic Remote Linux Devices}
-        \li \l{Deploying Applications to Generic Remote Linux Devices}
+        \li \l{Connecting Remote Linux Devices}
+        \li \l{Deploying to Remote Linux}
         \li \l{Specifying Run Settings for Linux-Based Devices}
-        \li \l{Running on Generic Remote Linux Devices}
+        \li \l{Running on Remote Linux Devices}
         \li \l{https://doc.qt.io/qtcreator/creator-overview-qtasam.html}
             {Qt Creator Plugin for Qt Application Manager}
     \endlist
@@ -105,7 +105,7 @@
 
     \list
         \li \l{Connecting QNX Devices}
-        \li \l{Deploying Applications to QNX Neutrino Devices}
+        \li \l{Deploying to QNX Neutrino}
         \li \l{Specifying Run Settings for QNX Devices}
         \li \l{Running on QNX Devices}
         \li \l{Qt for QNX}
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-running-generic-linux.qdocinc b/doc/qtcreator/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
index c4b0a4fb9c..d2d7880699 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
@@ -4,14 +4,14 @@
 /*!
 //! [running on embedded linux]
 
-    \section1 Running on Generic Remote Linux Devices
+    \section1 Running on Remote Linux Devices
 
     To build the application and run it on a device:
 
         \list 1
 
             \li Specify a connection to the device. For more information, see
-                \l{Connecting Generic Remote Linux Devices}.
+                \l{Connecting Remote Linux Devices}.
 
             \li Click the \uicontrol Run button.
 
@@ -25,12 +25,10 @@
     displayed on the device. Command-line output is visible in the \QC
     \uicontrol {Application Output} view.
 
-    Choose \uicontrol {Projects > Embedded Linux > Run} to view the settings for deploying
-    the application to the connected device.
-    \if defined(qtcreator)
-    For more information, see
+    In the \uicontrol {Projects} mode, select the remote Linux kit and then
+    select \uicontrol {Run} to view the settings for deploying the application
+    to the connected device. For more information, see
     \l{Specifying Run Settings for Linux-Based Devices}.
-    \endif
 
     Debugging works transparently if GDB server is installed on the device and
     it is compatible with the GDB on the host.
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc
index 40ccae7410..2683006f52 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-b2qt.qdocinc
@@ -17,7 +17,7 @@
     host and on the device.
 
     For more information on the deployment steps, see
-    \l{Deploying Applications to Boot2Qt Devices}.
+    \l{Deploying to Boot2Qt}.
 
 //! [run settings boot2qt]
 */
diff --git a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdocinc b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
index 26b832c45f..017163c3ee 100644
--- a/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
+++ b/doc/qtcreator/src/linux-mobile/creator-projects-settings-run-linux.qdocinc
@@ -11,7 +11,7 @@
     host to the device and add the device configurations to
     \l{glossary-buildandrun-kit}{kits}. Click \uicontrol {Manage Kits} to add devices
     to kits. For more information, see
-    \l {Connecting Generic Remote Linux Devices}.
+    \l {Connecting Remote Linux Devices}.
 
     When you run the application, \QC copies the files to the connected device.
 
diff --git a/doc/qtcreator/src/linux-mobile/linuxdev.qdoc b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
index 815aa2260c..b874866f60 100644
--- a/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
+++ b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc
@@ -3,15 +3,10 @@
 
     /*!
     \page creator-developing-generic-linux.html
-    \if defined(qtdesignstudio)
-    \previouspage creator-developing-android.html
-    \nextpage studio-advanced.html
-    \else
-    \previouspage creator-adding-docker-devices.html
-    \nextpage creator-developing-ios.html
-    \endif
+    \previouspage creator-developing-qnx.html
+    \nextpage creator-setup-webassembly.html
 
-    \title Connecting Generic Remote Linux Devices
+    \title Connecting Remote Linux Devices
 
     You can connect generic Linux devices to the development PC to run,
     debug, and analyze applications built for them from \QC.
@@ -19,10 +14,10 @@
     If you have a tool chain for building applications for embedded Linux
     devices installed on the development PC, you can add
     it to \QC. You can then select a \l{glossary-buildandrun-kit}{kit}
-    with \uicontrol {Embedded Linux} device type to
+    with the device type \uicontrol {Remote Linux Device} to
     build applications for and run them on the devices.
 
-    To be able to run and debug applications on generic remote Linux devices,
+    To be able to run and debug applications on remote Linux devices,
     you must add devices and select them in the \QC \l{glossary-buildandrun-kit}
     {kit}.
 
@@ -30,7 +25,7 @@
     in \uicontrol Edit > \uicontrol Preferences > \uicontrol Devices >
     \uicontrol Devices.
 
-    \image qtcreator-linux-device-configurations.png "Devices dialog"
+    \image qtcreator-preferences-devices-remote-linux.webp "Remote Linux Device in the Devices tab"
 
     You can protect the connections between \QC and a device by using an
     \l{https://www.openssh.com/}{OpenSSH} connection. OpenSSH is a
@@ -47,7 +42,7 @@
     you may need to enter the password on every connection to the device,
     or, if caching is enabled, at every \QC restart.
 
-    To configure connections between \QC and an embedded Linux device and to
+    To configure connections between \QC and a remote Linux device and to
     specify build and run settings for the device:
 
     \list 1
@@ -69,19 +64,22 @@
 
                 \li Select \uicontrol Edit > \uicontrol Preferences >
                     \uicontrol Devices > \uicontrol Devices > \uicontrol Add >
-                    \uicontrol {Generic Linux Device}
+                    \uicontrol {Remote Linux Device}
                     > \uicontrol {Start Wizard}.
 
-                    \image qtcreator-screenshot-devconf-linux.png "Connection Data wizard"
+                    \image qtcreator-preferences-devices-remote-linux-connection.webp "Connection Data wizard"
 
-                \li In the \uicontrol {The name to identify this configuration} field,
+                \li In \uicontrol {The name to identify this configuration},
                     enter a name for the connection.
 
-                \li In the \uicontrol {The device's host name or IP address} field,
+                \li In \uicontrol {The device's host name or IP address},
                     enter the host name or IP address of the device.
                     This value will be available in the variable \c %{Device:HostAddress}.
 
-                \li In the \uicontrol {The username to log into the device} field,
+                \li In \uicontrol {The device's SSH port number}, enter the port
+                    number to use for SSH connections. This value will be
+                    available in the variable \c %{Device:SshPort}.
+                \li In \uicontrol {The username to log into the device},
                     enter the username to log into the device and run the
                     application as.
                     This value will be available in the variable \c %{Device:UserName}.
@@ -89,7 +87,7 @@
                 \li Select \uicontrol {Next} to open the
                     \uicontrol {Key Deployment} dialog.
 
-                    \image qtcreator-generic-linux-device-key-deployment.png "Key Deployment dialog"
+                    \image qtcreator-preferences-devices-remote-linux-key-deployment.webp "Key Deployment dialog"
 
                 \li In \uicontrol {Private key file}, select a private key file
                     to use for authentication. This value will be available in
@@ -107,14 +105,16 @@
             \endlist
 
             All of these parameters can be edited later, as well as additional ones that the
-            wizard does not show because there are sensible default values. One of these is
-            the SSH port number, which is available in the variable \c %{Device:SshPort}.
+            wizard does not show because there are sensible default values.
 
 
         \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
             \uicontrol Add to add a kit for building for the device. Select the
-            Qt version, compiler, and device that you added above, and choose
-            \uicontrol {Generic Linux Device} for the device type.
+            Qt version, compiler, and device that you added above, and select
+            \uicontrol {Remote Linux Device} in \uicontrol {Device type}.
+
+            To build on the remote device, select \uicontrol {Remote Linux Device}
+            also in \uicontrol {Build device}.
 
         \li To specify build settings:
 
@@ -133,7 +133,7 @@
 
     When you run the project, \QC deploys the application as specified by the
     deploy steps. By default, \QC copies the application files to the device.
-    For more information, see \l{Deploying Applications to Generic Remote Linux Devices}.
+    For more information, see \l{Deploying to Remote Linux}.
 
     \endlist
 
diff --git a/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc
index 9b6d18ae0f..000017249a 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc
@@ -22,31 +22,28 @@
 
     \list
 
-        \li \l{Deploying Applications to Android Devices}
+        \li \l{Deploying to Android}
 
             When you deploy the application to an Android device, \QC copies
             the application files to the device. In addition, you can determine
             the Qt libraries to use.
 
-        \li \l {Deploying Applications to Boot2Qt Devices}
+        \li \l {Deploying to Boot2Qt}
 
             When you deploy the application to a Boot2Qt device, \QC copies
             the application files to the connected device. You can then test
             and debug the application on the device with \QC.
 
-        \li \l{Deploying Applications to Generic Remote Linux Devices}
-
-            When you deploy the application to a generic Linux-based device, \QC
-            copies the application files to the connected device. You can then
-            test and debug the application on the device with \QC.
-
-        \if defined(qtcreator)
-        \li  \l{Deploying Applications to QNX Neutrino Devices}
+        \li  \l{Deploying to QNX Neutrino}
 
             When you deploy the application to a QNX Neutrino device, \QC copies
             the application files to the connected device. You can then test and
             debug the application on the device with \QC.
-        \endif
 
+        \li \l{Deploying to Remote Linux}
+
+            When you deploy the application to a generic Linux-based device, \QC
+            copies the application files to the connected device. You can then
+            test and debug the application on the device with \QC.
     \endlist
 */
diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc
index 4cafa2923b..7af06ba9ff 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-mobile-platforms.qdoc
@@ -36,7 +36,7 @@
 
     \list
         \li \l{Connecting Android Devices}
-        \li \l{Deploying Applications to Android Devices}
+        \li \l{Deploying to Android}
         \li \l{Running on Multiple Platforms}
         \li \l{Creating a Mobile Application}
         \li \l{Debugging on Android Devices}
diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
index 0cf0d35c5d..cd64ccad70 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc
@@ -9,7 +9,7 @@
 
 /*!
     \page creator-connecting-mobile.html
-    \previouspage creator-deployment-qnx.html
+    \previouspage creator-deployment-embedded-linux.html
     \nextpage creator-developing-android.html
 
     \title Connecting Devices
@@ -40,32 +40,21 @@
             Qt version targeting Android and the Android SDK and NDK to develop
             for Android devices.
 
-        \if defined(qtcreator)
         \li \l{Connecting Bare Metal Devices}
 
             You can connect bare metal devices to the development PC and use \QC
             to debug applications on them with GDB or a hardware debugger.
-        \endif
 
         \li \l{Connecting Boot2Qt Devices}
 
             You can connect \l{Boot2Qt} devices to the development PC to run,
             debug, and analyze applications built for them from \QC.
 
-        \if defined(qtcreator)
         \li \l {Adding Docker Devices}
 
             You can add Docker images as \e devices to run, debug, and analyze
             applications built for Docker containers from \QC.
-        \endif
 
-        \li \l{Connecting Generic Remote Linux Devices}
-
-            If you have a tool chain for building applications for embedded
-            Linux devices installed on the development
-            PC, you can add it and the device to \QC.
-
-        \if defined(qtcreator)
         \li \l{Connecting iOS Devices}
 
             You use the tools delivered with Xcode to connect devices to \QC.
@@ -83,11 +72,15 @@
             debug applications on them from within \QC. This is currently only
             supported for QNX Neutrino devices, and requires the QNX SDK to be
             installed on the development PC.
-        \endif
+
+        \li \l{Connecting Remote Linux Devices}
+
+            If you have a tool chain for building applications for embedded
+            Linux devices installed on the development
+            PC, you can add it and the device to \QC.
 
     \endlist
 
-    \if defined(qtcreator)
     \section1 Related Topics
 
     \list
@@ -106,5 +99,4 @@
             local Linux PC, remote generic SSH Linux targets, or
             \l{Boot2Qt}{Boot2Qt devices}.
     \endlist
-    \endif
 */
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
index c0742a5f16..8acb985d3c 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
@@ -129,11 +129,11 @@
 
     \section1 Providing Deployment Information
 
-    If you want to run your application on a generic remote Linux device,
+    If you want to run your application on a remote Linux device,
     you first need to deploy your executable and possibly other files.
     \QC does that for you automatically if you provide the necessary
     information. This works the same way as explained for CMake in
-    \l {Deploying Applications to Generic Remote Linux Devices},
+    \l {Deploying to Remote Linux},
     except that you also need to include your application binary in the list.
 
     \section1 Creating a Run Configuration
diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc
index 03b835a27d..91ce4b81c3 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc
@@ -30,7 +30,7 @@
         \li \l{https://doc.qt.io/Boot2Qt/b2qt-installation-guides.html}
             {Boot2Qt Device} (commercial only)
         \li \l{Emulator}{Boot2Qt Emulator Device} (commercial only)
-        \li \l{Connecting Generic Remote Linux Devices}{Generic Remote Linux Device}
+        \li \l{Connecting Remote Linux Devices}{Remote Linux Device}
         \li \l{Connecting iOS Devices}{iOS Device}
         \li iOS Simulator
         \li \l{Connecting MCUs}{MCU Device} (commercial only)
diff --git a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
index 7e7b8e2059..06fcb20abd 100644
--- a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc
@@ -9,11 +9,10 @@
 // **********************************************************************
 
 /*!
-    \previouspage creator-deployment-embedded-linux.html
+    \previouspage creator-deployment-b2qt.html
     \page creator-deployment-qnx.html
-    \nextpage creator-connecting-mobile.html
-
-    \title Deploying Applications to QNX Neutrino Devices
+    \nextpage creator-deployment-embedded-linux.html
+    \title Deploying to QNX Neutrino
 
     You can specify settings for deploying applications to QNX Neutrino
     devices in the project configuration file and in \uicontrol Projects
@@ -22,7 +21,7 @@
     \image qtcreator-qnx-deployment.png "Deploy to device"
 
     The deployment process is described in more detail in
-    \l{Deploying Applications to Generic Remote Linux Devices}.
+    \l{Deploying to Remote Linux}.
 
     \section1 Finding Configured Devices
 
diff --git a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
index 546de76fcb..d6da86d0ee 100644
--- a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
+++ b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc
@@ -5,7 +5,7 @@
 /*!
     \previouspage creator-developing-mcu.html
     \page creator-developing-qnx.html
-    \nextpage creator-setup-webassembly.html
+    \nextpage creator-developing-generic-linux.html
 
     \title Connecting QNX Devices
 
@@ -19,7 +19,7 @@
     \section1 Adding a QNX Neutrino Device in \QC
 
     Adding a QNX Neutrino device is very similar to
-    \l{Connecting Generic Remote Linux Devices}, except that
+    \l{Connecting Remote Linux Devices}, except that
     you need to select \uicontrol {QNX Device} in the
     \uicontrol {Device Configuration} wizard.
 
diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc
index 7a491e0312..62fbde3516 100644
--- a/doc/qtcreator/src/qtcreator-toc.qdoc
+++ b/doc/qtcreator/src/qtcreator-toc.qdoc
@@ -139,9 +139,10 @@
             \li \l{Running on Multiple Platforms}
             \li \l{Deploying to Devices}
             \list
-                \li \l{Deploying Applications to Android Devices}
-                \li \l{Deploying Applications to Generic Remote Linux Devices}
-                \li \l{Deploying Applications to QNX Neutrino Devices}
+                \li \l{Deploying to Android}
+                \li \l{Deploying to Boot2Qt}
+                \li \l{Deploying to QNX Neutrino}
+                \li \l{Deploying to Remote Linux}
             \endlist
             \li \l{Connecting Devices}
             \list
@@ -149,10 +150,10 @@
                 \li \l{Connecting Bare Metal Devices}
                 \li \l{Connecting Boot2Qt Devices}
                 \li \l{Adding Docker Devices}
-                \li \l{Connecting Generic Remote Linux Devices}
                 \li \l{Connecting iOS Devices}
                 \li \l{Connecting MCUs}
                 \li \l{Connecting QNX Devices}
+                \li \l{Connecting Remote Linux Devices}
                 \li \l{Building Applications for the Web}
             \endlist
             \li \l{Customizing the Build Process}
diff --git a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
index 07b38ed7b9..d01c038ce5 100644
--- a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
+++ b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
 
     /*!
-    \previouspage creator-developing-qnx.html
+    \previouspage creator-developing-generic-linux.html
     \page creator-setup-webassembly.html
     \nextpage creator-build-process-customizing.html