Changing S60 to Symbian in the Docs

Changing names to Symbian platform

Task-number: QT-2268

Rev-by: Espen Riskedal

2 files changed, 18 insertions, 16 deletions

diff --git a/doc/src/platforms/qt-embedded.qdoc b/doc/src/platforms/qt-embedded.qdoc
index 0b2c2ac..c39a967 100644
--- a/doc/src/platforms/qt-embedded.qdoc
+++ b/doc/src/platforms/qt-embedded.qdoc
@@ -54,7 +54,7 @@
     Currently, three embedded platforms are supported by Qt:
 
     \table 90%
-    \header \o Embedded Linux \o Windows CE \o S60
+    \header \o Embedded Linux \o Windows CE \o Symbian platform
     \row
     \o \l{Qt for Embedded Linux} is designed to be used on Linux devices
     without X11 or existing graphical environments. This flavor of
@@ -67,8 +67,9 @@
     Applications use the appropriate style for the embedded
     environment and use native features, such as menus, to conform
     to the native style guidelines.
-    \o \l{S60 - Introduction to using Qt}{Qt for S60} is used to create
-    applications running in existing S60 environments.
+    \o \l{Symbian platform - Introduction to using Qt}{Qt for the Symbian
+platform} is used to create
+    applications running in existing Symbian platform environments.
     Applications use the appropriate style for the embedded
     environment and use native features, such as menus, to conform
     to the native style guidelines.
diff --git a/doc/src/platforms/s60-introduction.qdoc b/doc/src/platforms/s60-introduction.qdoc
index 086ee52..d145a82 100644
--- a/doc/src/platforms/s60-introduction.qdoc
+++ b/doc/src/platforms/s60-introduction.qdoc
@@ -40,10 +40,10 @@
 ****************************************************************************/
 
 /*!
-    \page s60-with-qt-introduction.html
+    \page symbian-with-qt-introduction.html
 
-    \title S60 - Introduction to using Qt
-    \brief An introduction to Qt for S60 developers.
+    \title Symbian platform - Introduction to using Qt
+    \brief An introduction to Qt for Symbian platform developers.
     \ingroup howto
     \ingroup qts60
 
@@ -51,21 +51,22 @@
 
     \section1 Required tools
     
-    See \l{Qt for S60 Requirements} to see what tools are required to use Qt for S60.
+    See \l{Qt for Symbian platform Requirements} to see what tools are
+required to use Qt for Symbian platform.
 
     \section1 Installing Qt and running demos
     
-    Follow the instructions found in \l{Installing Qt on S60 using binary package} to learn how
+    Follow the instructions found in \l{Installing Qt on the Symbian platform using binary package} to learn how
     to install Qt using binary package and how to build and run Qt demos.
 
-    Follow the instructions found in \l{Installing Qt on S60} to learn how to install Qt using
+    Follow the instructions found in \l{Installing Qt on the Symbian platform} to learn how to install Qt using
     using source package and how to build and run the Qt demos.
 
     \section1 Building your own applications
 
     If you are new to Qt development, have a look at \l{How to Learn Qt}. 
     In general, the difference between developing a
-    Qt application on S60 compared to any of the other platforms supported
+    Qt application on the Symbian platform compared to any of the other platforms supported
     by Qt is not that big.
 
     Once you have crated a \c .pro file for your project, generate the
@@ -76,10 +77,10 @@
     For more information on how to use qmake have a look at the \l
     {qmake Tutorial}.
 
-    Now you can build the Qt on S60 application with standard build
-    tools. By default, running \c make will produce binaries for the
-    emulator. However, S60 comes with several alternative build targets,
-    as shown in the table below:
+    Now you can build the Qt for the Symbian platform application with
+standard build tools. By default, running \c make will produce binaries for
+the emulator. However, the Symbian platform comes with several alternative
+build targets, as shown in the table below:
 
     \table
     \row \o \c debug-winscw  \o Build debug binaries for the emulator (default).
@@ -121,8 +122,8 @@
     \row \o \c QT_SIS_OPTIONS      \o Options accepted by \c .sis creation. 
                                        -i, install the package right away using PC suite.
                                        -c=<file>, read certificate information from a file.
-                                       Execute \c{createpackage.pl} script without any 
-                                       parameters for more information about options.
+                                       Execute \c{perl createpackage.pl} for more information
+                                       about options.
                                        By default no otions are given.
     \row \o \c QT_SIS_TARGET       \o Target for which \c .sis file is created.
                                        Accepted values are build targets listed in