Doc: replace "targets" with "devices" or "target platforms"

Try to make the terminology more consistent, where possible.

Change-Id: Ic3f86fcffe845f9a118bb2ee630e706e832e8e05
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

19 files changed, 54 insertions, 61 deletions

diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/src/debugger/qtquick-debugging.qdoc
index 36740492bf..87293b7f50 100644
--- a/doc/src/debugger/qtquick-debugging.qdoc
+++ b/doc/src/debugger/qtquick-debugging.qdoc
@@ -89,7 +89,7 @@
 
         \o  To debug applications on devices, check that Qt 4.7.4, or later,
             libraries are installed on the device and
-            \l{Running on Multiple Targets}{select the corresponding kit for the device}
+            \l{Running on Multiple Platforms}{select the corresponding kit for the device}
             before you start debugging.
 
     \endlist
diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc
index 7ab8dc6c56..67697d7056 100644
--- a/doc/src/linux-mobile/linuxdev.qdoc
+++ b/doc/src/linux-mobile/linuxdev.qdoc
@@ -36,7 +36,7 @@
     build and run applications on embedded Linux devices.
 
     To be able to run and debug applications on embedded Linux devices, you must
-    create device configurations and select them in the \QC \l{glossary-buildandrun-kit}{kit}
+    add devices and select them in the \QC \l{glossary-buildandrun-kit}{kit}.
 
     You use a wizard to create the connections. You can edit the settings later
     in \gui Tools > \gui Options > \gui Devices.
diff --git a/doc/src/linux-mobile/maemodev.qdoc b/doc/src/linux-mobile/maemodev.qdoc
index 0faefe9cb5..7af7a56964 100644
--- a/doc/src/linux-mobile/maemodev.qdoc
+++ b/doc/src/linux-mobile/maemodev.qdoc
@@ -224,7 +224,7 @@
     You use a wizard to create the connections. You can edit the settings later
     in \gui Tools > \gui Options > \gui Devices.
 
-    \image qtcreator-maemo-device-configurations.png "Maemo Device Configurations dialog"
+    \image qtcreator-maemo-device-configurations.png "Devices dialog"
 
     By default, you create the connection as the \e developer user. This
     protects real user data on the device from getting corrupted during
@@ -286,7 +286,7 @@
 
             \o  Select \gui {Maemo5/Fremantle} > \gui {Start Wizard}.
 
-            \image qtcreator-dev-conf-maemo.png "Maemo device configuration"
+            \image qtcreator-dev-conf-maemo.png "Maemo device"
 
             \o In the \gui {The name to identify this configuration} field,
             enter a name for the connection.
diff --git a/doc/src/linux-mobile/meegodev.qdoc b/doc/src/linux-mobile/meegodev.qdoc
index 1e246c89ea..a3af8549fa 100644
--- a/doc/src/linux-mobile/meegodev.qdoc
+++ b/doc/src/linux-mobile/meegodev.qdoc
@@ -237,7 +237,7 @@
     You use a wizard to create the connections. You can edit the settings later
     in \gui Tools > \gui Options > \gui Devices.
 
-    \image qtcreator-meego-device-configurations.png "MeeGo Device Configurations dialog"
+    \image qtcreator-meego-device-configurations.png "Devices dialog"
 
     By default, you create the connection as the \e developer user. This
     protects real user data on the device from getting corrupted during testing.
diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc
index 90d5bdb090..cb7bed3272 100644
--- a/doc/src/overview/creator-deployment-overview.qdoc
+++ b/doc/src/overview/creator-deployment-overview.qdoc
@@ -53,9 +53,9 @@
             Maemo 5/Fremantle devices.
         \o \l{Deploying Applications to QNX Devices}
 
-            When you deploy the application on a QNX device, depending
-            on your target device, \QC either generates a BAR package in the
-            build directory and deploys it to the connected device, or copies
+            When you deploy the application on a BlackBerry, \QC  generates a
+            BAR package in the build directory and deploys it to the connected
+            device. When you deploy it on a QNX Neutrino device, \QC copies
             the application files to the connected device. You can test and
             debug the application on the device.
     \endlist
@@ -67,8 +67,7 @@
 
             When you are ready to publish the application on a publishing
             channel, you must make sure that the installation file meets the
-            requirements for publishing and installing applications to the
-            targeted devices.
+            requirements for publishing on the channel.
     \endlist
 
 */
diff --git a/doc/src/overview/creator-glossary.qdoc b/doc/src/overview/creator-glossary.qdoc
index 293cdd7451..2b3f733889 100644
--- a/doc/src/overview/creator-glossary.qdoc
+++ b/doc/src/overview/creator-glossary.qdoc
@@ -103,7 +103,8 @@
             \o  Project
                 \target glossary-project
             \o  Groups together a set of source files, forms, and resource files
-                that you can build, deploy, and run for different \e targets, as
+                that you can build, deploy, and run for different desktop and
+                mobile device platforms, as
                 specified by a \e {build configuration}, \e {deploy
                 configuration}, and \e {run configuration}.
 
diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc
index da86b05dd9..40e35337e9 100644
--- a/doc/src/overview/creator-mobile-targets.qdoc
+++ b/doc/src/overview/creator-mobile-targets.qdoc
@@ -29,14 +29,13 @@
     \page creator-connecting-mobile.html
     \nextpage creator-developing-android.html
 
-    \title Connecting Mobile Targets
+    \title Connecting Mobile Devices
 
     You can connect mobile devices to the development PC to build, run, debug,
-    and analyze applications on them from \QC. When you install
-    \l{glossary-buildandrun-kit}{kits} for building and running on mobile targets
-    as part of the \QSDK, the build and run settings for the target devices are
-    set up automatically in \QC. However, \QSDK does not contain a tool chain
-    for building applications for embedded Linux devices.
+    and analyze applications on them from \QC. When you install an SDK for a
+    target platform, such as Android or QNX, the build and run settings for the
+    development targets delivered with the SDK might be set up automatically in
+    \QC.
 
     You can connect the device to the development PC using a USB connection.
     Additionally, you can connect Linux-based devices by using a WLAN
@@ -57,8 +56,7 @@
 
             If you have a tool chain for building applications for embedded
             Linux devices (with no MADDE support) installed on the development
-            PC, you can add it to \QC. Create device configurations and select
-            them in the \QC run settings.
+            PC, you can add it and the device to \QC.
 
         \o  \l{Connecting Maemo Devices}
 
diff --git a/doc/src/overview/creator-overview.qdoc b/doc/src/overview/creator-overview.qdoc
index fbd9b47b92..d05af8d609 100644
--- a/doc/src/overview/creator-overview.qdoc
+++ b/doc/src/overview/creator-overview.qdoc
@@ -90,7 +90,7 @@
                 applications for desktop environment and mobile devices.
                 \l{glossary-buildandrun-kit}{Kits}, build,
                 run, and deployment settings allow you to quickly switch between
-                different setups and targets.
+                different setups and target platforms.
 
                 For more information, see \l{Building and Running}.
             \o  \bold {\l{Debugging and Analyzing}}
diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-projects-build-run-tutorial.qdoc
index 11fa27de4d..b26c108c27 100644
--- a/doc/src/projects/creator-projects-build-run-tutorial.qdoc
+++ b/doc/src/projects/creator-projects-build-run-tutorial.qdoc
@@ -65,7 +65,7 @@
         \o  To test the application in \QS, click the \gui {Kit
             Selector} and select \gui {\QS}.
 
-            \image qtcreator-gs-build-example-select-qs.png "Selecting Qt Simulator as target device type"
+            \image qtcreator-gs-build-example-select-qs.png "Selecting Qt Simulator to run on"
 
         \o  Click
             \inlineimage qtcreator-run.png
@@ -82,7 +82,7 @@
 
         \o  Change the settings in the \gui Model view. For example, rotate the
             device by clicking the \gui {Orientation} buttons or choose from the
-            various mobile device configurations in the \gui {Device} field. You
+            various mobile devices in the \gui {Device} field. You
             can also simulate various mobile functions and create your own
             scripts.
 
diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-projects-building-running.qdoc
index 525909bc7d..637d6b4300 100644
--- a/doc/src/projects/creator-projects-building-running.qdoc
+++ b/doc/src/projects/creator-projects-building-running.qdoc
@@ -34,23 +34,24 @@
     \image creator_buildingrunning.png
 
     \QC provides support for building, running, and deploying Qt applications
-    for different targets, or using different compilers, debuggers or Qt versions.
+    for different target platforms, or using different compilers, debuggers, or
+    Qt versions.
     \l{glossary-buildandrun-kit}{Kits} define the tools,
     device type and other settings to use when building and running your project.
 
     \list
-        \o  \l{Building for Multiple Targets}
+        \o  \l{Building for Multiple Platforms}
 
             \e {Build configurations} contain everything you need to compile
             the sources into binaries. Build configurations use the tools and settings
             defined in their corresponding \l{glossary-buildandrun-kit}{kit}.
 
-        \o  \l{Running on Multiple Targets}
+        \o  \l{Running on Multiple Platforms}
 
             \e {Run configurations} start the application in the location
             where it was copied by the \e{deploy configuration}. By default,
             when you select the \gui Run function, \QC builds the project,
-            deploys it to the target defined in the \l{glossary-buildandrun-kit}{kit},
+            deploys it to the device defined in the \l{glossary-buildandrun-kit}{kit},
             and runs it there. However,
             if you have not made any changes to the project since you last
             built and deployed it, \QC simply runs it again.
@@ -62,10 +63,10 @@
             at. The files can be copied to a location in the file system of
             the development PC or a mobile device.
 
-        \o  \l{Connecting Mobile Targets}
+        \o  \l{Connecting Mobile Devices}
 
-            When you install tool chains for device types as part of the \QSDK,
-            the build and run settings for mobile device types are set up
+            When you install tool chains for device types as part of an SDK,
+            the build and run settings for mobile device types might be set up
             automatically. However, you might need to install and configure some
             additional software on the devices to be able to connect to them
             from the development PC.
@@ -79,7 +80,7 @@
         \o  \l{Customizing the Build Process}
 
             By default, running an application also builds it and deploys it to
-            a location from where it can be run on the target device. You can change
+            a location from where it can be run on the device. You can change
             the relationship between the build, run, and deploy configurations.
 
         \o  \l{http://doc.qt.nokia.com/qtsimulator/index.html}
diff --git a/doc/src/projects/creator-projects-building.qdoc b/doc/src/projects/creator-projects-building.qdoc
index 307310255c..c4eaeeb522 100644
--- a/doc/src/projects/creator-projects-building.qdoc
+++ b/doc/src/projects/creator-projects-building.qdoc
@@ -29,9 +29,10 @@
     \page creator-building-targets.html
     \nextpage creator-running-targets.html
 
-    \title Building for Multiple Targets
+    \title Building for Multiple Platforms
 
-    You can build applications for multiple targets, or using different compilers,
+    You can build applications for multiple target platforms, or using different
+    compilers,
     debuggers or Qt versions. \l{glossary-buildandrun-kit}{Kits} define the tools,
     device type and other settings to use.
 
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index cd467f1169..dcf5bd8785 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -238,7 +238,7 @@
     for building and running projects, select \gui{Tools} > \gui{Options} >
     \gui{Build & Run} > \gui{General}.
 
-    To specify build and run settings for different target platforms    ,
+    To specify build and run settings for different target platforms,
     select \gui Projects.
 
     \section1 Adding Files to Projects
diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc
index 29c9e77531..99488dd27a 100644
--- a/doc/src/projects/creator-projects-running.qdoc
+++ b/doc/src/projects/creator-projects-running.qdoc
@@ -29,7 +29,7 @@
     \page creator-running-targets.html
     \nextpage creator-deployment.html
 
-    \title Running on Multiple Targets
+    \title Running on Multiple Platforms
 
     By default, running an application also builds it and deploys it to a
     location from where it can be run on the desktop, in \QS, or
diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-projects-settings-overview.qdoc
index 2584d2337e..61e9bcbff1 100644
--- a/doc/src/projects/creator-projects-settings-overview.qdoc
+++ b/doc/src/projects/creator-projects-settings-overview.qdoc
@@ -31,10 +31,9 @@
 
     \title Configuring Projects
 
-    \omit
-    When you install the \QSDK, the build and run settings for the development
-    targets delivered with the \QSDK are set up automatically.
-    \endomit
+    When you install an SDK for a target platform, such as Android or QNX, the
+    build and run settings for the development
+    targets delivered with the SDK might be set up automatically in \QC.
 
     To view and modify the settings for currently open projects, switch to the
     \gui Projects mode by pressing \key Ctrl+5.
diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc
index b3f033cd83..b1a49bcef0 100644
--- a/doc/src/projects/creator-projects-targets.qdoc
+++ b/doc/src/projects/creator-projects-targets.qdoc
@@ -68,10 +68,7 @@
 
         \o  In the \gui Name column, double-click the kit name to change it.
 
-
-
-        \o  In the \gui{Device type} field, select the type of the device to
-            target.
+        \o  In the \gui{Device type} field, select the type of the device.
 
             Double-click the icon next to the field to select the image that is
             displayed in the kit selector for this kit. You can use any
@@ -80,7 +77,7 @@
             logo as an icon allows you to easily see, which compiler is used to
             build the project for the selected kit.
 
-        \o  In the \gui Device field, select the device configuration to target.
+        \o  In the \gui Device field, select a device.
 
         \o  In the \gui Sysroot field, specify the directory where the device
             image is located. If you are not cross-compiling, leave this field
diff --git a/doc/src/qnx/creator-deployment-qnx.qdoc b/doc/src/qnx/creator-deployment-qnx.qdoc
index 532af374c3..ff43970e71 100644
--- a/doc/src/qnx/creator-deployment-qnx.qdoc
+++ b/doc/src/qnx/creator-deployment-qnx.qdoc
@@ -32,13 +32,11 @@
 
     \title Deploying Applications to QNX Devices
 
-    When you deploy the application on the \gui{QNX} target, depending on your
-    target device, \QC either generates a BAR package and installs it on the
-    connected device, or copies the application files to the device.
+    You can deploy applications to BlackBerry and QNX Neutrino devices.
 
     \section1 Deploying to BlackBerry Devices
 
-    For \gui{BlackBerry} targets, \QC generates a BAR package in the build
+    For BlackBerry devices, \QC generates a BAR package in the build
     directory and installs it on the connected device. The contents of the BAR
     package are specified in the \gui{Application Descriptor File}.
 
@@ -64,7 +62,7 @@
 
     \section1 Deploying to QNX Neutrino Devices
 
-    Deploying applications to a \gui{QNX Neutrino} device is very similar to
+    Deploying applications to a QNX Neutrino device is very similar to
     \l{Deploying Applications to Linux-Based Devices}.
 
     \image qtcreator-qnx-deployment.png "Deploy to device"
diff --git a/doc/src/qnx/creator-developing-qnx.qdoc b/doc/src/qnx/creator-developing-qnx.qdoc
index 60b2fb2ed1..319400c2f5 100644
--- a/doc/src/qnx/creator-developing-qnx.qdoc
+++ b/doc/src/qnx/creator-developing-qnx.qdoc
@@ -80,9 +80,8 @@
     \section1 Adding a BlackBerry Device in \QC
 
     Adding a BlackBerry device is done using a wizard in the \gui{Device
-    Configurations} options. To launch it, go to \gui{Tools > Options >
-    Linux Devices > Device Configurations > Add... > BlackBerry Device > Start
-    Wizard}.
+    Configurations} options. To launch it, go to \gui Tools > \gui Options >
+    \gui Devices > \gui Add > \gui {BlackBerry Device} > \gui {Start Wizard}.
 
     \image qtcreator-qnx-device-configurations-wizard-1.png "Connection details"
 
@@ -109,10 +108,10 @@
     Click \gui{Next} and then \gui{Finish} to complete setting up the device
     connection.
 
-    Once the device is added, you can edit the settings directly in the
-    \gui{Device Configurations} options page.
+    Once the device is added, you can edit the settings directly in \gui Tools >
+    \gui Options > \gui Devices.
 
-    \image qtcreator-qnx-device-configurations.png "Device Configurations"
+    \image qtcreator-qnx-device-configurations.png "Devices"
 
     \section1 Adding a QNX Neutrino Device in \QC
 
diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
index c61a209b96..979638dd0b 100644
--- a/doc/src/qtcreator.qdoc
+++ b/doc/src/qtcreator.qdoc
@@ -86,10 +86,10 @@
             \o  \list
             \o  \bold {\l{Building and Running}}
                 \list
-                    \o  \l{Building for Multiple Targets}
-                    \o  \l{Running on Multiple Targets}
+                    \o  \l{Building for Multiple Platforms}
+                    \o  \l{Running on Multiple Platforms}
                     \o  \l{Deploying to Mobile Devices}
-                    \o  \l{Connecting Mobile Targets}
+                    \o  \l{Connecting Mobile Devices}
                 \endlist
             \endlist
             \o  \list
@@ -231,15 +231,15 @@
         \endlist
         \o  \l{Building and Running}
         \list
-            \o  \l{Building for Multiple Targets}
-            \o  \l{Running on Multiple Targets}
+            \o  \l{Building for Multiple Platforms}
+            \o  \l{Running on Multiple Platforms}
             \o  \l{Deploying to Mobile Devices}
             \list
                 \o  \l{Deploying Applications to Android Devices}
                 \o  \l{Deploying Applications to Linux-Based Devices}
                 \o  \l{Deploying Applications to QNX Devices}
             \endlist
-            \o  \l{Connecting Mobile Targets}
+            \o  \l{Connecting Mobile Devices}
             \list
                 \o  \l{Connecting Android Devices}
                 \o  \l{Connecting Embedded Linux Devices}
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index d92505411c..27d87db53a 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -184,7 +184,7 @@
             \image qmldesigner-new-project-harmattan-options.png "Harmattan Specific dialog"
 
         \o  In the \gui {Application icon} field, select the application
-            icon to use on Maemo or Harmattan targets, or use the default icon.
+            icon to use on Maemo or Harmattan devices, or use the default icon.
 
             The \gui {Project Management} dialog opens.