Doc: update run settings

Update screenshots

Change-Id: I8f10f6d2265d3b611c4df52447a9d79f07f2d3cb
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

doc/src/linux-mobile/creator-projects-settings-run-generic-linux.qdocinc

@@ -1,17 +0,0 @@
-    \section2 Specifying Run Settings for Generic Linux Devices
-
-    To run an application on a generic Linux device (without MADDE support),
-    create and select a device configuration in the Desktop run settings for
-    your project. You can also pass command line arguments to your application.
-
-    \image qtcreator-run-settings-linux-devices.png "Run settings for Generic Linux devices"
-
-    In addition, you must create a connection from the development PC to the
-    device.  Click \gui {Manage device configurations} to create connections.
-    For more information, see \l {Connecting Generic Linux Devices}.
-
-    When you run the application on the \gui Desktop target, \QC
-    generates an installation package in the build directory. The name of the
-    directory is displayed in the \gui {Create tarball} step. \QC copies
-    the tarball to devices by using the SSH file transfer protocol (SFTP) and
-    extracts it.

doc/src/linux-mobile/creator-projects-settings-run-linux.qdocinc

@@ -0,0 +1,24 @@
+    \section2 Specifying Run Settings for Linux-Based Devices
+
+    To run an application on a Linux-based device target (embedded Linux, MeeGo
+    Harmattan, or Maemo), create and select a device configuration in the run
+    settings for the project.
+    You can also pass command line arguments to your application.
+
+    \image qtcreator-screenshot-run-settings-maemo.png "Run settings for Linux-based devices"
+
+    To run and debug applications on Linux-based devices, you must
+    create connections from the development PC to the devices. Click
+    \gui {Manage device configurations} to create connections. For more
+    information, see \l{Configuring Connections to Maemo Devices},
+    \l{Configuring Connections to Harmattan Devices}, and
+    \l {Connecting Embedded Linux Devices}.
+
+    When you run the application, \QC copies the files to the connected device.
+
+    For MeeGo Harmattan and Maemo targets, \QC also generates an
+    installation package in the build directory by default. You can deliver the
+    installation package to users for installation
+    on devices that are of the same type and run the same firmware as the
+    connected device. For more information, see
+    \l{Deploying Applications to Linux-Based Devices}.

doc/src/linux-mobile/creator-projects-settings-run-madde.qdocinc

@@ -1,21 +0,0 @@
-    \section2 Specifying Run Settings for Maemo and MeeGo Harmattan Devices
-
-    To run an application on a Maemo or MeeGo Harmattan device, create and
-    select a device configuration in the Maemo 5 or Harmattan run settings for
-    your project.
-    You can also pass command line arguments to your application.
-
-    \image qtcreator-screenshot-run-settings-maemo.png "Run settings for Maemo devices"
-
-    To run and debug applications on Maemo or MeeGo Harmattan devices, you must
-    create connections from the development PC to the devices. Click
-    \gui {Manage device configurations} to create connections. For more
-    information, see \l{Configuring Connections to Maemo Devices} and
-    \l{Configuring Connections to Harmattan Devices}.
-
-    When you run the application on the \gui{Maemo5} or \gui Harmattan target,
-    \QC generates a Debian installation package in the build directory by
-    default. You can deliver the installation package to users for installation
-    on devices that are of the same type and run the same firmware as the
-    connected device. For more information, see
-    \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}.

doc/src/projects/creator-projects-settings-run.qdoc

@@ -51,9 +51,9 @@
     \if defined(qcmanual)
     \input projects/creator-projects-settings-run-desktop.qdocinc
     \input projects/creator-projects-settings-run-analyze.qdocinc
+    \input projects/creator-projects-settings-run-debug.qdocinc
     \input symbian/creator-projects-settings-run-symbian.qdocinc
-    \input linux-mobile/creator-projects-settings-run-madde.qdocinc
-    \input linux-mobile/creator-projects-settings-run-generic-linux.qdocinc
+    \input linux-mobile/creator-projects-settings-run-linux.qdocinc
     \endif
 
     \section1 Specifying a Custom Executable to Run

doc/src/symbian/creator-projects-settings-run-symbian.qdocinc

@@ -20,8 +20,8 @@
     When you deploy the application for the \gui{Symbian Device} target, \QC
     generates a Symbian installation system (SIS) file in the project folder
     and copies it to the device that is connected to the development PC. If no
-    device is connected, you must remove the \gui {Deploy SIS Package} step,
-    to create the package. Click \gui {Remove Item} to skip the step.
+    device is connected, you must remove the \gui {Deploy SIS Package} step
+    to create the package. Click \gui {Remove Item} (1) to skip the step.
 
     \image qtcreator-remove-deploy-step.png "Removing deploy steps"