Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys

2 files changed, 14 insertions, 31 deletions

diff --git a/doc/src/emb-install.qdoc b/doc/src/emb-install.qdoc
index 11b3f03..eb75697 100644
--- a/doc/src/emb-install.qdoc
+++ b/doc/src/emb-install.qdoc
@@ -42,10 +42,10 @@
 /*!
     \page qt-embedded-install.html
 
-    \title Installing Qt for Embedded Linux
+    \title Installing Qt on Embedded Linux
     \ingroup qt-embedded-linux
     \ingroup installation
-    \brief How to install Qt for Embedded Linux.
+    \brief How to install Qt on Embedded Linux.
 
     This document describes how to install \l{Qt for Embedded Linux} in your
     development environment:
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index befc7b6..697427d 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -532,55 +532,38 @@ in the \l{Qt for Windows CE Requirements} document.
 
     \o Depending on how you obtained the Qt for S60 release, follow the instructions in one of these pages:
        \list
-           \o \l{Installing Qt for S60 with installer}
-           \o \l{Installing Qt for S60 from source package}
+           \o \l{Installing Qt on S60 binary package}
+           \o \l{Installing Qt on S60 source package}
        \endlist
 \endlist
 */
 
 /*! \page install-S60-installer.html
 
-\title Installing Qt for S60 with installer
+\title Installing Qt on S60 binary package
 \ingroup installation
 \ingroup qts60
-\brief How to install Qt on S60 using installer.
+\brief How to install Qt on S60 using the binary package.
 \list 1
 
     \o  Install Qt
 
-        Run the \c{qt-s60-%VERSION%.exe} to install Qt.
+        Run \c{qt-s60-%VERSION%.exe} and follow the instructions.
 
         \note Qt must be installed on the same drive as the S60 SDK you are
         using, and the install path must not contain any spaces.
 
-    \o  Environment variables
-
-        In order to build and use Qt, the \c PATH environment variable needs
-        to be extended:
-
-        \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
-
-        This is done by adding \c{c:\Qt\%VERSION%\bin} to the \c PATH variable. 
-
-        On Windows the PATH can be extended by navigating to
-        "Control Panel->System->Advanced->Environment variables".
-
-        \note Instead of modifying system path, you can also use the "Qt S60 Command Prompt" 
-        to build your applications. It can be launched from start menu.
-
-        In addition, you must configure the environment for use with the S60
-        emulator. This is done by locating the Carbide.c++ submenu on the Start
-        menu, and choosing "Configure environment for WINSCW command line".
-
     \o  Running Qt demos
 
         We've included a subset of the Qt demos in this package for you
         to try out. An excellent starting point is the "fluidlauncher"
         demo. To run the demo on a real device, you first have to install
-        \c{qt_libs.sis} and \c{fluidlauncher.sis} 
-        found at Qt installation directory to the device.
+        \c{qt_libs.sisx} and \c{fluidlauncher.sisx} found in the Qt installation
+        directory. In Windows Explorer right click on the \c{.sisx} files and select
+        "Install with Nokia Application Installer" and follow the instructions.
 
-        To run the demos and examples on the emulator, you need to build them first:
+        To run the demos and examples on the emulator, you need to build them.
+        Open the "Qt for S60 Command Prompt" from the Start menu and type:
         
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 25
         
@@ -600,10 +583,10 @@ in the \l{Qt for Windows CE Requirements} document.
 */
 /*! \page install-S60-sources.html
 
-\title Installing Qt for S60 from source package
+\title Installing Qt on S60 source package
 \ingroup installation
 \ingroup qts60
-\brief How to install Qt on S60 from source package.
+\brief How to install Qt on S60 using the source package.
 
 \list 1