Doc: add Nokia N9 and update Harmattan info2.2

Change-Id: I5c1b88b18571530c5663bbecc2d4edd17d733dea
Reviewed-by: Christian Kandeler
Reviewed-on: http://codereview.qt.nokia.com/641
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

2 files changed, 33 insertions, 28 deletions

diff --git a/doc/maemodev.qdoc b/doc/maemodev.qdoc
index d4c54312ca..e6c92d2e2e 100644
--- a/doc/maemodev.qdoc
+++ b/doc/maemodev.qdoc
@@ -49,9 +49,8 @@
     information about the Maemo 5 platform, see
     \l{http://maemo.org/intro/platform/}{Software Platform} on the Maemo web site.
 
-    \omit
-    For more information about the Harmattan platform, see ##Add link.
-    \endomit
+    For more information about the Harmattan platform, see
+    \l{http://harmattan-dev.nokia.com/}{Harmattan Platform SDK}.
 
     \endif
 
@@ -65,7 +64,8 @@
 
     \note \QSDK does not contain the tool chains for building applications for
     other MeeGo devices than MeeGo Harmattan. You can try to run applications
-    from Qt Creator on other MeeGo devices, but it has not been tested, and the
+    from Qt Creator on other MeeGo devices, but it has not been extensively
+    tested, and the
     instructions might not always apply.
 
     \section1 Hardware and Software Requirements
@@ -81,7 +81,7 @@
                 \o  Maemo 5 device: Nokia N900 with software update release 1.3
                     (V20.2010.36-2) or later installed.
 
-                \o  Harmattan device: Nokia N950
+                \o  Harmattan device: Nokia N950, Nokia N9
 
             \endlist
 
@@ -118,7 +118,7 @@
 
     To use a WLAN connection, you must activate WLAN on the device and connect
     it to the same WLAN as the development PC. The network address is displayed
-    in the Mad Developer.
+    in the connectivity tool.
 
     To use a USB connection, you need to set up the device as a network device
     on the development PC.
@@ -127,16 +127,16 @@
     WLAN, you can
     ignore the USB-specific parts in the following sections.
 
-    \section2 Starting SDK Connectivity on Nokia N950
+    \section2 Starting SDK Connectivity on Harmattan Devices
 
-    SDK Connectivity application is preinstalled in the Nokia N950 and
+    SDK Connectivity application is preinstalled in Harmattan devices and
     available in developer mode.
 
     To start SDK Connectivity:
 
     \list
 
-        \o  On the Nokia N950, select \gui {Settings > Security > Developer
+        \o  On the device, select \gui {Settings > Security > Developer
             mode} to turn on developer mode.
 
         \o  Select \gui {Applications > SDK Connectivity} to start the SDK
@@ -298,7 +298,7 @@
     You can protect the connections between Qt Creator and
     a device by using either a password or an SSH key. If you use a password, you
     must generate it in the connectivity tool and enter it in Qt Creator every time
-    you connect to the device.
+    you start the connectivity tool.
 
     If you do not have an SSH key, you can create it in Qt Creator.
     Encrypted keys are not supported. For more
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 15f0a690a6..8f99b84097 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -450,7 +450,7 @@
     applications in conditions practically identical to running the application
     on a Nokia N900 device with the software update release 1.3 (V20.2010.36-2).
 
-    The Harmattan emulator emulates the Nokia N950 device environment.
+    The Harmattan emulator emulates the Nokia N9 device environment.
 
     With the emulators, you can test how your application reacts to hardware
     controls, such as the power button, and to the touch screen.
@@ -4776,13 +4776,6 @@
     configurations} to create connections. For more information, see
     \l {Configuring Connections in Qt Creator}.
 
-    By default, Qt Creator runs the remote gdbserver daemon on the device for
-    debugging. On Maemo 5, if the sysroot does not match that of the device,
-    you
-    can run remote GDB, instead. Select the \gui {Use remote GDB} option in
-    \gui {Debugging details}. Select the \gui {Set debugger} link to specify
-    settings for GDB.
-
     When you run the application on the \gui{Maemo5} or \gui Harmattan target,
     Qt Creator generates
     a Debian installation package in the build directory by default. You can deliver
@@ -5560,6 +5553,11 @@
     You cannot publish applications that are built with the beta version of the
     MeeGo Harmattan tool chain to Ovi Store.
 
+    However, you can prepare for publishing by making sure that your application
+    meets the
+    \l{http://www.developer.nokia.com/info/sw.nokia.com/id/44affcd1-ceba-4aca-8b65-670ce2cbbd1e/MeeGo_1_2_Harmattan_Applications_Ovi_Store_Entry_Requirements.html}
+    {MeeGo 1.2 Harmattan Applications: Ovi Store Entry Requirements}.
+
 */
 
 /*!
@@ -5714,9 +5712,10 @@
         behaves when the orientation of the device display rotates between portrait
         and landscape, and then click \gui{Next}.
 
-        \note This dialog opens only if you select \gui Maemo5, \gui Harmattan,
-        or
-        \gui {Symbian Device} target in the \gui {Target Setup} dialog.
+        \note This dialog opens only if you select \gui Maemo5 or
+        \gui {Symbian Device} target in the \gui {Target Setup} dialog. On
+        Harmattan, the Qt Quick Components for MeeGo provide native-looking
+        rotation.
 
         The \gui {Symbian Specific} dialog opens.
 
@@ -5732,7 +5731,7 @@
 
         \image qtcreator-mobile-project-maemo-options.png "Maemo Specific dialog"
 
-        \o In the \gui {Application icon (64x64)} field, select the application
+        \o In the \gui {Application icon} field, select the application
          icon to use on Maemo 5 or Harmattan targets, or click \gui Next to use
          the default icon.
 
@@ -5905,7 +5904,7 @@
     applications in conditions practically identical to running the application
     on a Nokia N900 device with the software update release 1.3 (V20.2010.36-2).
 
-    The MeeGo Harmattan emulator emulates the Nokia N950 device environment.
+    The MeeGo Harmattan emulator emulates the Nokia N9 device environment.
 
     For more information, see \l{Using Maemo or MeeGo Harmattan Emulator}.
 
@@ -9144,9 +9143,10 @@
         behaves when the orientation of the device display rotates between portrait
         and landscape, and then click \gui Next.
 
-        \note This dialog opens only if you select \gui Harmattan, \gui Maemo5,
-        or
-        \gui {Symbian Device} target in the \gui {Target Setup} dialog.
+        \note This dialog opens only if you select \gui Maemo5 or
+        \gui {Symbian Device} target in the \gui {Target Setup} dialog. On
+        Harmattan, the Qt Quick Components for MeeGo provide native-looking
+        rotation.
 
         The \gui {Symbian Specific} dialog opens.
 
@@ -9168,7 +9168,7 @@
 
         \image qmldesigner-new-project-maemo-options.png "Maemo Specific dialog"
 
-        \o In the \gui {Application icon (64x64)} field, select the application
+        \o In the \gui {Application icon} field, select the application
          icon to use on Maemo or Harmattan targets, or use the default icon.
 
         The \gui {QML Sources} dialog opens.
@@ -10006,7 +10006,7 @@
     applications in conditions practically identical to running the application
     on a Nokia N900 device with software update release 1.3 (V20.2010.36-2).
 
-    The MeeGo Harmattan emulator emulates the Nokia N950 device environment.
+    The MeeGo Harmattan emulator emulates the Nokia N9 device environment.
 
     With the emulators, you can test how your application reacts to hardware
     controls, such as the power button, and to the touch screen.
@@ -10147,6 +10147,11 @@
     and displays the text \e {Shutting down} in the emulator window title pane.
     The emulator closes shortly after this.
 
+    You can also select the \gui {Start Maemo Emulator} button to close the
+    emulator. This is a faster way to close the emulator, because it does not
+    wait for the operating system running on the emulated machine to shut down,
+    but this also means that it is less safe.
+
 */