Merge remote-tracking branch 'origin/4.12' into qds-1.50qds-1.50

Change-Id: I8e4155aa2a0a8c7f7405dd79e856380011e23a33

1 files changed, 5 insertions, 4 deletions

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 4a2c4c42ab..df454aaa6d 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc
@@ -141,10 +141,11 @@
 
     \section1 Providing Deployment Information
 
-    If you want to run your application on an embedded 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 \l {Deploying CMake Projects to Embedded Linux Devices}{here},
+    If you want to run your application on a generic 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
+    \l {Deploying CMake Projects to Generic Remote Linux Devices}{here},
     except that you also need to include your application binary in the list.
 
     \section1 Creating a Run Configuration