Changed several S60 references to Symbian references in docs.

Reviewed-by: Janne Koskinen

3 files changed, 15 insertions, 17 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 87132cc..d040d3d 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -952,7 +952,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 130
 
-    The default values depend on the version of the S60 SDK you're using.
+    The default values depend on the version of the Symbian SDK you're using.
 
     \section2 Compiler specific options
 
@@ -983,8 +983,7 @@
     an official UID, please contact Nokia. Both \c SID and \c VID default to empty values.
 
     For more information about unique identifiers and their meaning for
-    Symbian applications, please refer to the
-    \l{http://www.symbian.com/developer/techlib/v9.2docs/doc_source/ToolsAndUtilities/BuildTools/UsingUids.guide.html}{respective S60 SDK documentation}.
+    Symbian applications, please refer to the Symbian SDK documentation.
 
     \section2 Capabilities
 
@@ -1000,8 +999,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 134
 
-    For more information about capabilities, please refer to the
-    \l{http://www.symbian.com/developer/techlib/v9.2docs/doc_source/guide/platsecsdk/index.html}{respective S60 SDK documentation}.
+    For more information about capabilities, please refer to the Symbian SDK documentation.
 */
 
 /*!
@@ -2925,7 +2923,7 @@ For example:
     \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.
+    information, please refer to the Symbian SDK documentation.
 
     \target TARGET.EPOCALLOWDLLDATA
     \section1 TARGET.EPOCALLOWDLLDATA
@@ -2961,7 +2959,7 @@ For example:
     \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.
+    library. For more information, see the Symbian SDK documentation.
 
     \target TARGET.UID2
     \section1 TARGET.UID2
@@ -2970,7 +2968,7 @@ For example:
 
     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
-    as TARGET.UID3. For more information, see the S60 SDK documentation.
+    as TARGET.UID3. For more information, see the Symbian SDK documentation.
 
     \target TARGET.UID3
     \section1 TARGET.UID3
@@ -2981,7 +2979,7 @@ For example:
     library. If this variable is not specified, a UID3 suitable for development
     and debugging will be generated automatically. However, applications being
     released should always define this variable. For more information, see the
-    S60 SDK documentation.
+    Symbian SDK documentation.
 
     \target TARGET.VID
     \section1 TARGET.VID
@@ -2989,7 +2987,7 @@ For example:
     \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.
+    library. For more information, see the Symbian SDK documentation.
 
     \section1 TARGET_EXT
 
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 366a906..8269552 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -510,9 +510,9 @@ in the \l{Qt for Symbian platform Requirements} document.
 
     \o  Install Qt
 
-        Run \c{qt-s60-%VERSION%.exe} and follow the instructions.
+        Run \c{qt-symbian-opensource-%VERSION%.exe} and follow the instructions.
 
-        \note Qt must be installed on the same drive as the S60 SDK you are
+        \note Qt must be installed on the same drive as the Symbian SDK you are
         using, and the install path must not contain any spaces.
 
     \o  Running Qt demos
@@ -567,7 +567,7 @@ If you are using pre-built binaries, follow the instructions
         Uncompress the package into the directory you want Qt installed,
         e.g. \c{C:\Qt\%VERSION%}.
 
-        \note Qt must be installed on the same drive as the S60 SDK you are
+        \note Qt must be installed on the same drive as the Symbian SDK you are
         using, and the install path must not contain any spaces.
 
     \o  Environment variables
@@ -582,7 +582,7 @@ If you are using pre-built binaries, follow the instructions
         On Windows the PATH can be extended by navigating to
         "Control Panel->System->Advanced->Environment variables".
 
-        In addition, you must configure the environment for use with the S60
+        In addition, you must configure the environment for use with the Symbian
         emulator. This is done by locating the Carbide.c++ submenu on the Start
         menu, and choosing "Configure environment for WINSCW command line".
 
@@ -972,13 +972,13 @@ Symbian platform, see \l{Symbian platform - Introduction to using Qt}.
            \endlist
         \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/}{S60 Platform SDK 3rd Edition FP1 or higher}
         \o \l{http://www.forum.nokia.com/main/resources/technologies/openc_cpp/}{Open C/C++ v1.6.0 or higher}. 
-           Install this to all S60 SDKs you plan to use Qt with.
+           Install this to all Symbian SDKs you plan to use Qt with.
         \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 686] or later,
            which is not available free of charge. 
     \endlist
 
     Running Qt on real device requires the following packages to be installed on your device.
-    The packages can be found in the S60 SDK where you installed Open C/C++:
+    The packages can be found in the Symbian SDK where you installed Open C/C++:
     \list
         \o \c{nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis}
         \o \c{nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis}
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 38f346f..a946540 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -488,7 +488,7 @@
     Qt 4.6 is the first release to include support for the Symbian
     platform, with integration into the S60 framework. The port to
     Symbian and S60 provides all functionality required to develop
-    rich end-user applications for devices running Symbian 3.1 and
+    rich end-user applications for devices running S60 3.1 and
     later.
 
     \section1 Animation Framework