Changing S60 to Symbian in the Docs

Changing names to Symbian platform

Task-number: QT-2268

Rev-by: Espen Riskedal

5 files changed, 91 insertions, 82 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index f2cae5bd43..87132cc101 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -920,7 +920,7 @@
     {deployment guide for Windows}.
 
 
-    \section1 S60
+    \section1 Symbian platform
 
     Features specific to this platform include handling of static data,
     capabilities, stack and heap size, compiler specific options, and unique
@@ -940,7 +940,7 @@
 
     \section2 Stack and heap size
 
-    Symbian uses predefined sizes for stacks and heaps. If an
+    The Symbian platform uses predefined sizes for stacks and heaps. If an
     application exceeds either limit, it may crash or fail to complete its
     task. Crashes that seem to have no reason can often be traced back to
     insufficient stack and/or heap sizes.
@@ -1095,7 +1095,7 @@
     \target BLD_INF_RULES
     \section1 BLD_INF_RULES
     
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
     
     Generic \c bld.inf file content can be specified with \c BLD_INF_RULES variables. 
     The section of \c bld.inf file where each rule goes is appended to 
@@ -1288,7 +1288,7 @@
     The build process for bundles is also influenced by
     the contents of the \l{#QMAKE_BUNDLE_DATA}{QMAKE_BUNDLE_DATA} variable.
 
-    These options only have an effect on Symbian:
+    These options only have an effect on the Symbian platform:
     
     \table 95%
     \header \o Option \o Description
@@ -1345,7 +1345,7 @@
     \target DEPLOYMENT
     \section1 DEPLOYMENT
 
-    \e {This is only used on Windows CE and Symbian.}
+    \e {This is only used on Windows CE and the Symbian platform.}
 
     Specifies which additional files will be deployed. Deployment means the
     transfer of files from the development system to the target device or
@@ -1363,8 +1363,8 @@
 
     The default deployment target path for Windows CE is
     \c{%CSIDL_PROGRAM_FILES%\target}, which usually gets expanded to
-    \c{\Program Files\target}. For Symbian, the default target is the application
-    private directory on the drive it is installed to.
+    \c{\Program Files\target}. For the Symbian platform, the default target
+is the application private directory on the drive it is installed to.
 
     It is also possible to specify multiple \c sources to be deployed on
     target \c paths. In addition, different variables can be used for
@@ -1375,10 +1375,10 @@
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 29
 
     \note In Windows CE all linked Qt libraries will be deployed to the path
-    specified by \c{myFiles.path}. In Symbian all libraries and executables
+    specified by \c{myFiles.path}. On Symbian platform all libraries and executables
     will always be deployed to the \\sys\\bin of the installation drive.
     
-    Since the Symbian build system automatically moves binaries to certain
+    Since the Symbian platform build system automatically moves binaries to certain
     directories under the epoc32 directory, custom plugins, executables or
     dynamically loadable libraries need special handling. When deploying
     extra executables or dynamically loadable libraries, the target path
@@ -1393,13 +1393,13 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 128
 
-    In Symbian, generic PKG file content can also be specified with this
+    On the Symbian platform, generic PKG file content can also be specified with this
     variable. You can use either \c pkg_prerules or \c pkg_postrules to 
     pass raw data to PKG file. The strings in \c pkg_prerules are added before
     package-body and \c pkg_postrules after. The strings defined in 
     \c pkg_postrules or \c pkg_prerules are not parsed by qmake, so they 
     should be in a format understood by Symbian package generation tools. 
-    Please consult Symbian documentation for correct syntax.
+    Please consult the Symbian platform documentation for correct syntax.
     
     For example, to deploy DLL and add a new dependency: 
 
@@ -1424,7 +1424,7 @@
     override languages statement, you must override also package-header
     statement and all other statements which are language specific.
     
-    In Symbian, the \c default_deployment item specifies 
+    On the Symbian platform, the \c default_deployment item specifies 
     default platform dependencies. It can be overwritten if a more 
     restrictive set is needed - e.g. if a specific
     device is required to run the application.
@@ -1436,7 +1436,7 @@
     \target DEPLOYMENT_PLUGIN
     \section1 DEPLOYMENT_PLUGIN
 
-    \e {This is only used on Windows CE and Symbian.}
+    \e {This is only used on Windows CE and the Symbian platform.}
 
     This variable specifies the Qt plugins that will be deployed. All plugins
     available in Qt can be explicitly deployed to the device. See
@@ -1446,9 +1446,9 @@
     If the application depends on plugins, these plugins have to be specified 
     manually.
     
-    \note In Symbian, all plugins supported by this variable will be deployed
-    by default with Qt libraries, so generally using this variable is not 
-    needed.
+    \note On the Symbian platform, all plugins supported by this variable
+will be deployed by default with Qt libraries, so generally using this
+variable is not needed.
 
     For example:
 
@@ -1556,7 +1556,7 @@
     \target ICON
     \section1 ICON
     
-    This variable is used only in MAC and S60 to set the application icon.
+    This variable is used only in MAC and the Symbian platform to set the application icon.
     Please see \l{Setting the Application Icon}{the application icon documentation}
     for more information.
     
@@ -1623,10 +1623,10 @@
 
     This variable contains a list of libraries to be linked into the project.
     You can use the Unix \c -l (library) and -L (library path) flags and qmake
-    will do the correct thing with these libraries on Windows and Symbian
-    (namely this means passing the full path of the library to the linker). The
-    only limitation to this is the library must exist, for qmake to find which
-    directory a \c -l lib lives in.
+    will do the correct thing with these libraries on Windows and the
+    Symbian platform (namely this means passing the full path of the library to
+    the linker). The only limitation to this is the library must exist, for
+    qmake to find which directory a \c -l lib lives in.
 
     For example:
 
@@ -1647,7 +1647,8 @@
     explicitly specify the library to be used by including the \c{.lib}
     file name suffix.
 
-    \bold{Note:} On S60, the build system makes a distinction between shared and
+    \bold{Note:} On the Symbian platform, the build system makes a
+distinction between shared and
     static libraries. In most cases, qmake will figure out which library you
     are refering to, but in some cases you may have to specify it explicitly to
     get the expected behavior. This typically happens if you are building a
@@ -1693,7 +1694,7 @@
     \target MMP_RULES
     \section1 MMP_RULES
     
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
     
     Generic MMP file content can be specified with this variable. 
     
@@ -2013,8 +2014,9 @@
     the \c QMAKE_CXXFLAGS_DEBUG and \c QMAKE_CXXFLAGS_RELEASE variables,
     respectively.
 
-    \bold{Note:} On S60, this variable can be used to pass architecture specific
-    options to each compiler in the Symbian build system. For example:
+    \bold{Note:} On the Symbian platform, this variable can be used to pass
+architecture specific options to each compiler in the Symbian build system.
+For example:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 131
 
@@ -2812,7 +2814,7 @@
     \target RSS_RULES
     \section1 RSS_RULES
     
-    \e {This is only used on Symbian.}    
+    \e {This is only used on the Symbian platform.}    
     
     Generic RSS file content can be specified with this variable. The syntax is 
     similar to \c MMP_RULES and \c BLD_INF_RULES.
@@ -2832,10 +2834,12 @@
     
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 145
     
-    This example will install the application to MyFolder in S60 application
-    shell. In addition it will make the application to be launched in background.
+    This example will install the application to MyFolder in the Symbian
+    platform application shell. In addition it will make the application to
+    be launched in background.
 
-    For detailed list of possible RSS statements, please refer to Symbian OS help.    
+    For detailed list of possible RSS statements, please refer to the
+    Symbian platform help.    
 
     \note You should not use \c RSS_RULES variable to set the following RSS statements:
     
@@ -2848,7 +2852,7 @@
     \target S60_VERSION
     \section1 S60_VERSION
 
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
     
     Contains the version number of the underlying S60 SDK; e.g. "5.0".
 
@@ -2918,7 +2922,7 @@
     \target TARGET.CAPABILITY
     \section1 TARGET.CAPABILITY
 
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
 
     Specifies which platform capabilities the application should have. For more
     information, please refer to the S60 SDK documentation.
@@ -2926,7 +2930,7 @@
     \target TARGET.EPOCALLOWDLLDATA
     \section1 TARGET.EPOCALLOWDLLDATA
 
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
 
     Specifies whether static data should be allowed in the application. Symbian
     disallows this by default in order to save memory. To use it, set this to 1.
@@ -2934,7 +2938,7 @@
     \target TARGET.EPOCHEAPSIZE
     \section1 TARGET.EPOCHEAPSIZE
 
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
 
     Specifies the minimum and maximum heap size of the application. The program
     will refuse to run if the minimum size is not available when it starts. For
@@ -2945,7 +2949,7 @@
     \target TARGET.EPOCSTACKSIZE
     \section1 TARGET.EPOCSTACKSIZE
 
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
 
     Specifies the maximum stack size of the application. For example:
 
@@ -2954,7 +2958,7 @@
     \target TARGET.SID
     \section1 TARGET.SID
 
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
 
     Specifies which secure identifier to use for the target application or
     library. For more information, see the S60 SDK documentation.
@@ -2962,7 +2966,7 @@
     \target TARGET.UID2
     \section1 TARGET.UID2
 
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
 
     Specifies which unique identifier 2 to use for the target application or
     library. If this variable is not specified, it defaults to the same value
@@ -2971,7 +2975,7 @@
     \target TARGET.UID3
     \section1 TARGET.UID3
 
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
 
     Specifies which unique identifier 3 to use for the target application or
     library. If this variable is not specified, a UID3 suitable for development
@@ -2982,7 +2986,7 @@
     \target TARGET.VID
     \section1 TARGET.VID
 
-    \e {This is only used on Symbian.}
+    \e {This is only used on the Symbian platform.}
 
     Specifies which vendor identifier to use for the target application or
     library. For more information, see the S60 SDK documentation.
@@ -3862,9 +3866,10 @@
 		\o Indicates that the output should not be added to the list of objects to be linked in.
 	\endtable
 
-    \note Symbian specific: Generating objects to be linked in is not supported in Symbian, 
-          so either the \c CONFIG option \c no_link or variable \c variable_out
-          should always be defined for extra compilers.
+    \note Symbian platform specific: Generating objects to be linked in is
+    not supported on the Symbian platform, so either the \c CONFIG option
+    \c no_link or variable \c variable_out should always be defined for
+    extra compilers.
     
 */
 
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 2ace8de78e..366a906145 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -497,14 +497,14 @@ in the \l{Qt for Windows CE Requirements} document.
     We hope you will enjoy using Qt. Good luck!
 */
 
-/*! \page install-S60-installer.html
+/*! \page install-Symbian-installer.html
 
-\title Installing Qt on S60 using binary package
+\title Installing Qt on the Symbian platform using binary package
 \ingroup qts60
-\brief How to install Qt on S60 using the binary package.
+\brief How to install Qt on the Symbian platform using the binary package.
 
-\note Qt for S60 has some requirements that are given in more detail
-in the \l{Qt for S60 Requirements} document.
+\note Qt for Symbian platform has some requirements that are given in more detail
+in the \l{Qt for Symbian platform Requirements} document.
 
 \list 1
 
@@ -527,7 +527,7 @@ in the \l{Qt for S60 Requirements} document.
         and follow the instructions.
 
         To run the demos and examples on the emulator, you need to build them first.
-        Open the "Qt for S60 Command Prompt" from the Start menu and type:
+        Open the "Qt for Symbian platform Command Prompt" from the Start menu and type:
         
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 25
         
@@ -536,27 +536,29 @@ in the \l{Qt for S60 Requirements} document.
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 27
 
-        For more information about building and running Qt programs on S60,
-        see \l{S60 - Introduction to using Qt}.
+        For more information about building and running Qt programs on the
+Symbian platform,
+        see \l{Symbian platform - Introduction to using Qt}.
 
     We hope you will enjoy using Qt.
 
 \endlist
 
 */
-/*! \page install-S60.html
+/*! \page install-Symbian.html
 
-\title Installing Qt on S60
+\title Installing Qt on the Symbian platform
 \ingroup installation
 \ingroup qts60
-\brief How to install Qt on S60
+\brief How to install Qt for the Symbian platform
 
-\note Qt for S60 has some requirements that are given in more detail
-in the \l{Qt for S60 Requirements} document.
+\note Qt for the Symbian platform has some requirements that are given in more detail
+in the \l{Qt for Symbian platform Requirements} document.
 
-\note \bold {This document describes how to install and configure Qt for S60 from scratch. 
+\note \bold {This document describes how to install and configure Qt for
+the Symbian platform from scratch. 
 If you are using pre-built binaries, follow the instructions
-\l{Installing Qt on S60 using binary package}{here}.}
+\l{Installing Qt on the Symbian platform using binary package}{here}.}
 
 \list 1
 
@@ -586,7 +588,7 @@ If you are using pre-built binaries, follow the instructions
 
     \o  Configure Qt
 
-        To configure Qt for S60, do:
+        To configure Qt for the Symbian platform, do:
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 23
         to build the tools using MinGW, and the libraries using abld.
@@ -633,8 +635,8 @@ If you are using pre-built binaries, follow the instructions
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 27
 
-        For more information about building and running Qt programs on S60,
-        see \l{S60 - Introduction to using Qt}.
+        For more information about building and running Qt programs on the
+Symbian platform, see \l{Symbian platform - Introduction to using Qt}.
 
     We hope you will enjoy using Qt.
 
@@ -669,7 +671,7 @@ If you are using pre-built binaries, follow the instructions
     \list
     \o \l{Qt for Embedded Linux Requirements}
     \o \l{Qt for Mac OS X Requirements}
-    \o \l{Qt for S60 Requirements}
+    \o \l{Qt for Symbian platform Requirements}
     \o \l{Qt for Windows CE Requirements}
     \o \l{Qt for Windows Requirements}
     \o \l{Qt for X11 Requirements}
@@ -953,13 +955,13 @@ If you are using pre-built binaries, follow the instructions
 */
 
 /*!
-    \page requirements-s60.html
-    \title Qt for S60 Requirements
+    \page requirements-symbian.html
+    \title Qt for Symbian platform Requirements
     \ingroup installation
-    \brief Setting up the S60 environment for Qt.
+    \brief Setting up the Symbian platform environment for Qt.
     \previouspage General Qt Requirements
 
-    Qt for S60 requires the following software installed on your development PC:
+    Qt for Symbian platform requires the following software installed on your development PC:
     \list
         \o \l{http://www.mingw.org/}{MinGW 3.4.5 or higher}, or another windows compiler to build the tools.
         \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}           
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index ece2dcf9a4..4108c11cb0 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -213,9 +213,9 @@
 
     The GNOME developer website is at \l{http://developer.gnome.org/}.
     
-    \section1 Setting the Application Icon on S60 platforms
+    \section1 Setting the Application Icon on the Symbian platform
     
-    In order to set the application icon for S60 applications, you need
+    In order to set the application icon for Symbian platform applications, you need
     an SVG-T icon. For information on how to create SVG-T compliant icons,
     please refer to
     \l{http://wiki.forum.nokia.com/index.php/How_to_create_application_icon(SVG)_in_S60_3rd_edition/}
diff --git a/doc/src/platforms/qt-embedded.qdoc b/doc/src/platforms/qt-embedded.qdoc
index 0b2c2ac562..c39a967641 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 086ee52dc9..d145a82b28 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