8 files changed, 17 insertions, 71 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index cecccf6..668f3b4 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -84,6 +84,7 @@ Qt applications.
 \list
 \o \l{QtWebKit QML Module}
 \o \l{http://doc.qt.nokia.com/qtmobility-1.1.0/qml-plugins.html}{Mobility QML Plugins}
+\o \l {http://doc.qt.nokia.com/qt-components-symbian-1.1/index.html}{Qt Quick Components}
 \endlist
 
 \section1 Qt Quick Tools
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 6b7a5fc..fd74ee3 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -185,6 +185,7 @@ should first be obtained and installed.
 \list
 \o \l{WebView}{QtWebKit QML Module - WebView Element} - For displaying Web contents
 \o \l{http://doc.qt.nokia.com/qtmobility-1.1.0/qml-plugins.html}{Mobility QML Plugins}
+\o \l {http://doc.qt.nokia.com/qt-components-symbian-1.1/index.html}{Qt Quick Components}
 \endlist
 
 */
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index 5c0652c..201b5c7 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -149,13 +149,6 @@
        implement a small Web browser.
     \endlist
 
-    \section1 Multimedia
-
-    \list
-    \o \l{demos/spectrum}{Spectrum Analyser} shows how the \l{QtMultimedia}
-       module can be used to manipulate audio as it is played.
-    \endlist
-
     \section1 Phonon
 
     \list
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 2936d60..6c4e90c 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -559,20 +559,22 @@ Symbian platform,
 
 */
 /*! \page install-Symbian.html
-\title Installing Qt for the Symbian platform
+\title Installing Qt for the Symbian Platform
 \ingroup installation
 \ingroup qtsymbian
 \brief How to install Qt for the Symbian platform.
 \previouspage Installation
 \tableofcontents
 
+    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools 
+    and libraries for developing Qt applications. However, if you want to build 
+    Qt itself for Symbian, follow the instructions below.
+
 Qt for the Symbian platform has some requirements that are given in more detail
 in the \l{Qt for the Symbian platform Requirements} document.
 
 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 given in the \l{Installing Qt for the Symbian platform from a
-Binary Package} document.
+the Symbian platform from scratch.
 
 \section1 Step 1: Set Up the Development Environment
 
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 2abc286..f706623 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -514,7 +514,6 @@
     \ingroup internationalization
     \previouspage Internationalization with Qt
     \contentspage Internationalization with Qt
-    \nextpage Translation Rules for Plurals
     \brief How to write source code in a way that makes it possible for user-visible text to be translated.
 
     \tableofcontents
@@ -700,8 +699,8 @@
     set using QLocale::setDefault(). (If no default locale was
     specified, the "C" locale is used.)
 
-    A summary of the rules used to translate strings containing plurals can be
-    found in the \l{Translation Rules for Plurals} document.
+    A summary of supported languages and the rules used to translate strings
+    containing plurals can be obtained by running \tt{lupdate -list-languages}.
 
     \section1 Enabling Translation
 
@@ -717,55 +716,5 @@
 
     \section1 Further Reading
 
-    \l{Qt Linguist Manual}, \l{Hello tr() Example}, \l{Translation Rules for Plurals}
-*/
-
-/*!
-    \page i18n-plural-rules.html
-    \title Translation Rules for Plurals
-    \ingroup internationalization
-    \previouspage Writing Source Code for Translation
-    \contentspage Internationalization with Qt
-    \brief A summary of the translation rules for plurals produced by Qt's i18n tools.
-
-    The table below shows the specific rules that are produced by Qt Linguist
-    and \c lrelease for a selection of languages. Cells marked \e otherwise
-    indicate the form used when none of the other rules are appropriate for a
-    specific language.
-
-    \table 80%
-    \header \o Language \o Rule 1 \o Rule 2 \o Rule 3
-    \row \o English \o \c{n == 1} 
-        \o \e{otherwise} \o N/A
-    \row \o French \o \c{n < 2} 
-        \o \e{otherwise} \o N/A
-    \row \o Czech \o \c{n % 100 == 1} 
-        \o \c{n % 100 >= 2 && n % 100 <= 4} 
-        \o \e{otherwise}
-    \row \o Irish \o \c{n == 1} 
-        \o \c{n == 2} \o \e{otherwise}
-    \row \o Latvian \o \c{n % 10 == 1&& n % 100 != 11} 
-        \o \c{n != 0} \o \e{otherwise}
-    \row \o Lithuanian \o \c{n % 10 == 1&& n % 100 != 11} 
-        \o \c{n % 100 != 12 && n % 10 == 2} 
-        \o \e{otherwise}
-    \row \o Macedonian \o \c{n % 10 == 1} 
-        \o \c{n % 10 == 2} \o \e{otherwise}
-    \row \o Polish \o \c{n == 1} 
-        \o \c{n % 10 >= 2 && n % 10 <= 4
-            && (n % 100 < 10 || n % 100 > 20)} 
-        \o \e{otherwise}
-    \row \o Romanian \o \c{n == 1} 
-        \o \c{n == 0|| (n % 100 >= 1 && n % 100 <= 20)} 
-        \o \e{otherwise}
-    \row \o Russian \o \c{n % 10 == 1&& n % 100 != 11} 
-        \o \c{n % 10 >= 2 && n % 10 <= 4
-            && (n % 100 < 10 || n % 100 > 20)} 
-        \o \e{otherwise}
-    \row \o Slovak \o \c{n == 1} \o \c{n >= 2 && n <= 4} 
-        \o \e{otherwise}
-    \row \o Japanese \o \e{otherwise} \o N/A \o N/A
-    \endtable
-
-    The rules themselves are not documented and are internal to Qt Linguist and \c lrelease.
+    \l{Qt Linguist Manual}, \l{Hello tr() Example}
 */
diff --git a/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp b/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp
index fd5f386..a5f3ed1 100644
--- a/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp
+++ b/doc/src/snippets/code/doc_src_unix-signal-handlers.cpp
@@ -44,7 +44,7 @@ class MyDaemon : public QObject
     Q_OBJECT
 
   public:
-    MyDaemon(QObject *parent = 0, const char *name = 0);
+    MyDaemon(QObject *parent = 0);
     ~MyDaemon();
 
     // Unix signal handlers.
@@ -67,8 +67,8 @@ class MyDaemon : public QObject
 
 
 //! [1]
-MyDaemon::MyDaemon(QObject *parent, const char *name)
-    	 : QObject(parent,name)
+MyDaemon::MyDaemon(QObject *parent)
+        : QObject(parent)
 {
     if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sighupFd))
        qFatal("Couldn't create HUP socketpair");
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
index 11f5163..e695572 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
+++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
@@ -76,7 +76,7 @@ QString result = future.result();
 //! [4]
 // call 'QList<QByteArray>  QByteArray::split(char sep) const' in a separate thread
 QByteArray bytearray = "hello world";
-QFuture<QList<QByteArray> > future = QtConcurrent::run(bytearray, &QByteArray::split), ',');
+QFuture<QList<QByteArray> > future = QtConcurrent::run(bytearray, &QByteArray::split, ',');
 ...
 QList<QByteArray> result = future.result();
 //! [4]
@@ -84,7 +84,7 @@ QList<QByteArray> result = future.result();
 //! [5]
 // call 'void QImage::invertPixels(InvertMode mode)' in a separate thread
 QImage image = ...;
-QFuture<void> future = QtConcurrent::run(image, &QImage::invertPixels, QImage::InvertRgba);
+QFuture<void> future = QtConcurrent::run(&image, &QImage::invertPixels, QImage::InvertRgba);
 ...
 future.waitForFinished();
 // At this point, the pixels in 'image' have been inverted
diff --git a/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
index 269aa44..91c5401 100644
--- a/doc/src/snippets/code/src_corelib_io_qsettings.cpp
+++ b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
@@ -230,7 +230,7 @@ settings.setValue("sofa", true);
 settings.setValue("tv", false);
 
 QStringList groups = settings.childGroups();
-// group: ["fridge"]
+// groups: ["fridge"]
 //! [21]