Doc: Embedded Linux target

Change-Id: I9d2c09abfc6efbfbe0af87c8592bcd93aec7bd04
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

11 files changed, 70 insertions, 44 deletions

diff --git a/doc/images/qtcreator-embedded-linux-deployment.png b/doc/images/qtcreator-embedded-linux-deployment.png
new file mode 100644
index 00000000000..eb015b9f039
--- /dev/null
+++ b/doc/images/qtcreator-embedded-linux-deployment.png
diff --git a/doc/images/qtcreator-maemo-deb-package.png b/doc/images/qtcreator-maemo-deb-package.png
index 3e6c084b093..7a8b6071e08 100644
--- a/doc/images/qtcreator-maemo-deb-package.png
+++ b/doc/images/qtcreator-maemo-deb-package.png
diff --git a/doc/images/qtcreator-maemo-deployment.png b/doc/images/qtcreator-maemo-deployment.png
index 9987311632f..e1692df4e6c 100644
--- a/doc/images/qtcreator-maemo-deployment.png
+++ b/doc/images/qtcreator-maemo-deployment.png
diff --git a/doc/src/linux-mobile/creator-deployment-madde.qdoc b/doc/src/linux-mobile/creator-deployment-madde.qdoc
index 9740fb2e091..81318b5b7bf 100644
--- a/doc/src/linux-mobile/creator-deployment-madde.qdoc
+++ b/doc/src/linux-mobile/creator-deployment-madde.qdoc
@@ -31,15 +31,16 @@
     \page creator-deployment-maemo.html
     \nextpage creator-connecting-mobile.html
 
-    \title Deploying Applications to Maemo or MeeGo Harmattan Devices
+    \title Deploying Applications to Linux-Based Devices
 
-    You can specify settings for deploying applications to Maemo 5 and MeeGo
-    Harmattan devices in the project .pro file. You can view the settings in the
+    You can specify settings for deploying applications to Linux-based devices
+    (Embedded Linux, MeeGo Harmattan, and Maemo 5) in the project .pro file.
+    You can view the settings in the
     \gui {Run Settings}.
 
     \image qtcreator-maemo-deployment.png "Deploy to device"
 
-    The files to be installed are listed in the \gui {Deploy to Device} step,
+    The files to be installed are listed in the \gui {Deployment} step,
     the \gui {Files to install for subproject} field. The \gui {Local File Path}
     field displays the location of the file on the development PC. The
     \gui {Remote Directory} field displays the folder where the file is
@@ -48,6 +49,36 @@
     \l{http://doc.qt.nokia.com/4.8/qmake-variable-reference.html#installs}
     {INSTALLS variable} in the project .pro file to add the missing files.
 
+    When you run the application, \QC copies the necessary files to the device
+    and starts the application on it.
+
+    \section1 Deploying on Embedded Linux
+
+    \image qtcreator-embedded-linux-deployment.png "Deploy to embedded Linux"
+
+    When you run the application on the \gui {Embedded Linux} target, \QC
+    deploys the application as specified by the deploy steps. By default,
+    \QC copies the application files to the device by using the SSH file
+    transfer protocol (SFTP), as specified by the \gui {Upload files via SFTP}
+    step.
+
+    If you have a lot of data to copy, select \gui Details in the
+    \gui {Upload Files via SFTP} step, and then select the
+    \gui {Incremental deployment} check box. \QC takes note of the deployment
+    time and only copies files that have changed since the last deployment.
+    However, when you make major changes on the device, such as removing files
+    from the device manually or flashing a new disk image, or when you use
+    another device with the same IP address, deselect the check box once, to
+    have \QC deploy all files again.
+
+    To only create a tarball and not copy the files to the device, select
+    \gui {Add Deploy Step > Create tarball}. Then remove all other deploy steps.
+
+    The \gui {Deploy tarball via SFTP upload} step specifies that \QC
+    uploads the tarball to the device and extracts it.
+
+    \section1 Deploying on MeeGo Harmattan and Maemo 5
+
     You can use desktop files to display icons on the home screen of the
     device. To add desktop files to the project file, select \gui {Add Desktop
     File}. To specify the icon file to display, select \gui {Add Launcher
diff --git a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
index 64b7f0b7043..ff35cae55e4 100644
--- a/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
+++ b/doc/src/linux-mobile/creator-projects-running-generic-linux.qdocinc
@@ -1,4 +1,4 @@
-    \section1 Running on Generic Linux Devices
+    \section1 Running on Embedded Linux Devices
 
     \list 1
 
@@ -10,7 +10,7 @@
         \list 1
 
             \o  Specify a connection to the device. For more information, see
-                \l{Connecting Generic Linux Devices}.
+                \l{Connecting Embedded Linux Devices}.
 
             \o  Click the \gui Run button.
 
@@ -21,15 +21,14 @@
     \QC uses the compiler specified in the project build settings
     (tool chain) to build the application.
 
-    \QC generates an installation package, installs it on the
-    device, and executes the selected application. The application views are
+    \QC copies the application files to the connected device and runs the
+    application. The application views are
     displayed on the device. Command-line output is visible in the \QC
     \gui {Application Output} view.
 
-    Choose \gui {Projects > Desktop > Run} to view the settings for deploying
-    the application on the connected device and creating the installation
-    package. For more information, see
-    \l{Specifying Run Settings for Generic Linux Devices}.
+    Choose \gui {Projects > Embedded Linux > Run} to view the settings for deploying
+    the application on the connected device. For more information, see
+    \l{Specifying Run Settings for Linux-Based Devices}.
 
     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/src/linux-mobile/creator-projects-running-madde.qdocinc b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc
index bd648892ce1..b3259e0d5e1 100644
--- a/doc/src/linux-mobile/creator-projects-running-madde.qdocinc
+++ b/doc/src/linux-mobile/creator-projects-running-madde.qdocinc
@@ -36,6 +36,6 @@
     Choose \gui {Projects > Maemo Run} to view the settings for deploying the
     application on the connected device and creating the installation package.
     For more information, see
-    \l{Specifying Run Settings for Maemo and MeeGo Harmattan Devices}.
+    \l{Specifying Run Settings for Linux-Based Devices}.
 
     Debugging also works transparently.
diff --git a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc
index 66c0b6260d0..9bd29b5b747 100644
--- a/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc
+++ b/doc/src/linux-mobile/creator-publish-ovi-maemo.qdoc
@@ -59,7 +59,7 @@
 
     You set the application name and installation folder in the
     \gui {Run Settings} for the project. For more information, see
-    \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}. \QC
+    \l{Deploying Applications to Linux-Based Devices}. \QC
     specifies the correct category settings by default when it creates the
     Debian directory and the necessary files.
 
diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc
index deecbb00fe2..70dedcab50a 100644
--- a/doc/src/linux-mobile/linuxdev.qdoc
+++ b/doc/src/linux-mobile/linuxdev.qdoc
@@ -26,16 +26,17 @@
     \page creator-developing-generic-linux.html
     \nextpage creator-developing-maemo.html
 
-    \title Connecting Generic Linux Devices
+    \title Connecting Embedded Linux Devices
 
-    You can connect generic Linux devices to the development PC to build, run,
+    You can connect embedded Linux devices to the development PC to build, run,
     debug, and analyze applications on them from \QC.
 
-    If you have the tool chain for building applications for generic Linux
+    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.
+    it to \QC. You can then select the \gui {Embedded Linux} target to
+    run applications on embedded Linux devices.
 
-    To be able to run and debug applications on generic Linux devices, you must
+    To be able to run and debug applications on embedded Linux devices, you must
     create device configurations and select them in the \QC run
     settings.
 
@@ -48,7 +49,7 @@
     either a password or an SSH key. If you do not have an SSH key, you can
     create it in \QC. For more information, see \l {Generating SSH Keys}.
 
-    To configure connections between \QC and generic Linux devices:
+    To configure connections between \QC and embedded Linux devices:
 
     \list 1
 
@@ -56,7 +57,7 @@
 
         \o  Select \gui {Tools > Options > Build & Run > Qt Versions > Add} to
             add the Qt version
-            for the generic Linux.
+            for the embedded Linux.
 
         \o  Select \gui {Tools > Options > Build & Run > Tool Chains > Add} to
             add the tool
@@ -100,7 +101,7 @@
 
             \o  Select \gui {Projects > Desktop > Build}.
 
-            \o  Select the Qt version and tool chain for the generic Linux
+            \o  Select the Qt version and tool chain for the embedded Linux
                 device.
 
         \endlist
@@ -109,26 +110,19 @@
 
         \list 1
 
-            \o  Select \gui {Run > Add > Build Tarball and Deploy to Linux Host}
+            \o  Select \gui {Run > Add > Deploy to Remote Linux Host}
                 to add a new deploy configuration.
 
-                \image qtcreator-run-settings-linux-devices.png "Run settings for generic Linux devices"
+                \image qtcreator-run-settings-linux-devices.png "Run settings for embedded Linux devices"
 
             \o  In the \gui {Device configuration} field, select the device
                 connection.
 
         \endlist
 
-        When you run the project, \QC creates an installation package in
-        the build directory. The name of the directory is displayed in the
-        \gui {Create tarball} step.
-
-        The \gui {Deploy tarball via SFTP upload using device} step specifies
-        that \QC uploads the tarball to the device and extracts it.
-                You can add custom deploy steps and remove the default step if
-                it is incompatible with your steps.
-                To only create a tarball and not copy the files to the device,
-                remove all deploy steps.
+    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 Linux-Based Devices}.
 
     \endlist
 
diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc
index 3d3e4402259..35e57834c25 100644
--- a/doc/src/overview/creator-deployment-overview.qdoc
+++ b/doc/src/overview/creator-deployment-overview.qdoc
@@ -47,12 +47,14 @@
             in the project folder and copies it to the connected device. You can
             sign the SIS file and wrap it in a Nokia Smart Installer for Symbian
             package. You can test and debug the application on the device.
-        \o  \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}
+        \o  \l{Deploying Applications to Linux-Based Devices}
 
-            When you deploy the application on the \gui{Maemo5} or
-            \gui Harmattan target, \QC generates a Debian installation package
-            in the build directory and copies it to the connected device. You
+            When you deploy the application on a Linux-based device target, such
+            as \gui {Embedded Linux}, \gui Harmattan, or \gui{Maemo5}, \QC
+            copies the application files to the connected device. You
             can test and debug the application on the device.
+            You can create Debian installation packages for MeeGo Harmattan and
+            Maemo 5 devices.
     \endlist
 
     \section1 Related Topics
diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc
index bf9c9c33192..498e4964bc3 100644
--- a/doc/src/overview/creator-mobile-targets.qdoc
+++ b/doc/src/overview/creator-mobile-targets.qdoc
@@ -36,8 +36,8 @@
     You can connect mobile devices to the development PC to build, run, debug,
     and analyze applications on them from \QC. When you install mobile targets
     as part of the \QSDK, the build and run settings for the target devices are
-    set up automatically in \QC. Currently, the tool chain for building
-    applications for generic Linux devices is not included in \QSDK.
+    set up automatically in \QC. However, \QSDK does not contain a tool chain
+    for building applications for embedded Linux devices.
 
     You can connect the device to the development PC using a USB connection.
     Additionally, you can connect Linux-based devices by using a WLAN
@@ -45,9 +45,9 @@
 
     \list
 
-        \o  \l{Connecting Generic Linux Devices}
+        \o  \l{Connecting Embedded Linux Devices}
 
-            If you have the tool chain for building applications for generic
+            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.
diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
index e52e0732126..9df84039084 100644
--- a/doc/src/qtcreator.qdoc
+++ b/doc/src/qtcreator.qdoc
@@ -219,12 +219,12 @@
             \o  \l{Deploying to Mobile Devices}
             \list
                 \o  \l{Deploying Applications to Symbian Devices}
-                \o  \l{Deploying Applications to Maemo or MeeGo Harmattan Devices}
+                \o  \l{Deploying Applications to Linux-Based Devices}
             \endlist
             \o  \l{Connecting Mobile Targets}
             \list
                 \o  \l{Connecting MeeGo Harmattan Devices}
-                \o  \l{Connecting Generic Linux Devices}
+                \o  \l{Connecting Embedded Linux Devices}
                 \o  \l{Connecting Maemo Devices}
                 \o  \l{Connecting Symbian Devices}
             \endlist