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

Conflicts:
	src/corelib/tools/qringbuffer_p.h

63 files changed, 1115 insertions, 278 deletions

diff --git a/doc/src/3rdparty.qdoc b/doc/src/3rdparty.qdoc
index a87878e..23dfb12 100644
--- a/doc/src/3rdparty.qdoc
+++ b/doc/src/3rdparty.qdoc
@@ -61,6 +61,15 @@
 
     \tableofcontents
 
+    \section1 DES (\c des.cpp)
+
+    \e{Implementation of DES encryption for NTLM\br
+    Copyright 1997-2005 Simon Tatham.\br
+    This software is released under the MIT license.}
+
+    See \c src/3rdparty/des/des.cpp for more information about the terms and
+    conditions under which the code is supplied.
+
     \section1 FreeType 2 (\c freetype) version 2.3.6
 
     \e{The FreeType project is a team of volunteers who develop free, portable
@@ -108,18 +117,6 @@
     See \c src/3rdparty/harfbuzz/COPYING.FTL and src/3rdparty/harfbuzz/COPYING.GPL
     for license details.
 
-    \section1 MD5 (\c md5.cpp and \c md5.h)
-
-    \e{This code implements the MD5 message-digest algorithm.
-    The algorithm is due to Ron Rivest.  This code was
-    written by Colin Plumb in 1993, no copyright is claimed.
-    This code is in the public domain; do with it what you wish.} -- quoted from
-    \c src/3rdparty/md5/md5.h
-
-    See \c src/3rdparty/md5/md5.cpp and \c src/3rdparty/md5/md5.h for more
-    information about the terms and conditions under which the code is
-    supplied.
-
     \section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 6b
 
     \e{This package contains C software to implement JPEG image compression and
@@ -132,6 +129,29 @@
 
     See \c src/3rdparty/libjpeg/README for license details.
 
+    \section1 MD4 (\c md4.cpp and \c md4.h)
+
+    \e{MD4 (RFC-1320) message digest.\br
+    Modified from MD5 code by Andrey Panin <pazke@donpac.ru>\br\br
+    Written by Solar Designer <solar@openwall.com> in 2001, and placed in\br
+    the public domain.  There's absolutely no warranty.}
+
+    See \c src/3rdparty/md4/md4.cpp and \c src/3rdparty/md4/md4.h for more
+    information about the terms and conditions under which the code is
+    supplied.
+
+    \section1 MD5 (\c md5.cpp and \c md5.h)
+
+    \e{This code implements the MD5 message-digest algorithm.
+    The algorithm is due to Ron Rivest.  This code was
+    written by Colin Plumb in 1993, no copyright is claimed.
+    This code is in the public domain; do with it what you wish.} -- quoted from
+    \c src/3rdparty/md5/md5.h
+
+    See \c src/3rdparty/md5/md5.cpp and \c src/3rdparty/md5/md5.h for more
+    information about the terms and conditions under which the code is
+    supplied.
+
     \section1 MNG Library (\c libmng) version 1.0.10
 
     \e{The libmng library supports decoding, displaying, encoding, and various
@@ -152,6 +172,56 @@
 
     See \c src/3rdparty/libpng/LICENSE for license details.
 
+    \section1 The ptmalloc memory allocator (\c ptmalloc3) version 1.8
+
+    \e ptmcalloc3 is a scalable concurrent memory allocator suitable
+    for use in multi-threaded programs.
+
+    \hr
+
+    Copyright (c) 2001-2006 Wolfram Gloger
+
+    Permission to use, copy, modify, distribute, and sell this software
+    and its documentation for any purpose is hereby granted without fee,
+    provided that (i) the above copyright notices and this permission
+    notice appear in all copies of the software and related documentation,
+    and (ii) the name of Wolfram Gloger may not be used in any advertising
+    or publicity relating to the software.
+
+    THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+    IN NO EVENT SHALL WOLFRAM GLOGER BE LIABLE FOR ANY SPECIAL,
+    INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
+    DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+    WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY
+    OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
+
+    \hr
+
+    See \c src/3rdparty/ptmalloc/COPYRIGHT for license details.
+
+    \section1 SHA-1 (\c sha1.cpp)
+
+    \e{Based on the public domain implementation of the SHA-1 algorithm\br
+    Copyright (C) Dominik Reichl <dominik.reichl@t-online.de>}
+
+    See \c src/3rdparty/sha1/sha1.cpp for more information about the terms and
+    conditions under which the code is supplied.
+
+    \section1 SQLite (\c sqlite) version 3.5.9
+
+    \e{SQLite is a small C library that implements a
+    self-contained, embeddable, zero-configuration SQL database engine.}
+    -- quoted from \l{http://www.sqlite.org/}{www.sqlite.org}.
+
+    According to the comments in the source files, the code is in the public
+    domain. See the
+    \l{http://www.sqlite.org/copyright.html}{SQLite Copyright} page on the
+    SQLite web site for further information.
+
     \section1 TIFF Software Distribution (\c libtiff) version 3.8.2
 
     \e {libtiff is a set of C functions (a library) that support the
@@ -212,17 +282,6 @@
 
     See \c src/3rdparty/libtiff/COPYRIGHT for license details.
 
-    \section1 SQLite (\c sqlite) version 3.5.9
-
-    \e{SQLite is a small C library that implements a
-    self-contained, embeddable, zero-configuration SQL database engine.}
-    -- quoted from \l{http://www.sqlite.org/}{www.sqlite.org}.
-
-    According to the comments in the source files, the code is in the public
-    domain. See the
-    \l{http://www.sqlite.org/copyright.html}{SQLite Copyright} page on the
-    SQLite web site for further information.
-
     \section1 Wintab API (\c wintab)
 
     Wintab is a de facto API for pointing devices on Windows. The
@@ -238,35 +297,4 @@
     src/3rdparty/zlib/README.
 
     See \c src/3rdparty/zlib/README for license details.
-
-    \section1 The ptmalloc memory allocator (\c ptmalloc3) version 1.8
-
-    \e ptmcalloc3 is a scalable concurrent memory allocator suitable
-    for use in multi-threaded programs.
-
-    \hr
-
-    Copyright (c) 2001-2006 Wolfram Gloger
-
-    Permission to use, copy, modify, distribute, and sell this software
-    and its documentation for any purpose is hereby granted without fee,
-    provided that (i) the above copyright notices and this permission
-    notice appear in all copies of the software and related documentation,
-    and (ii) the name of Wolfram Gloger may not be used in any advertising
-    or publicity relating to the software.
-
-    THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-    IN NO EVENT SHALL WOLFRAM GLOGER BE LIABLE FOR ANY SPECIAL,
-    INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
-    DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-    WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY
-    OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-
-    \hr
-
-    See \c src/3rdparty/ptmalloc/COPYRIGHT for license details.
 */
diff --git a/doc/src/accessible.qdoc b/doc/src/accessible.qdoc
index 090da86..ad9f4f1 100644
--- a/doc/src/accessible.qdoc
+++ b/doc/src/accessible.qdoc
@@ -527,7 +527,7 @@
     on plugins, consult the plugins \l{How to Create Qt
     Plugins}{overview document}.
 
-    You can omit the the first macro unless you want the plugin
+    You can omit the first macro unless you want the plugin
     to be statically linked with the application.
 
     \section2 Implementing Interface Factories
diff --git a/doc/src/credits.qdoc b/doc/src/credits.qdoc
index 114e28d..6b48514 100644
--- a/doc/src/credits.qdoc
+++ b/doc/src/credits.qdoc
@@ -188,7 +188,7 @@
     Jesper K. Pedersen <blackie atklaralvdalens-datakonsult.se>\br
     Jim Lauchlan <jim.lauchlan at gecm.com>\br
     Joachim Backes <backes at rhrk.uni-kl.de>\br
-    Jochen R&ouml;mmler <jochen at concept.de>\br
+    Jochen R\ouml\c{}mmler <jochen at concept.de>\br
     Jochen Scharrlach <jscharrl at BA-Stuttgart.De>\br
     Joe Croft <jcroft at swbell.net>\br
     Joel Lindholm <wizball at kewl.campus.luth.se>\br
diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc
index bcfa93d..446c91b 100644
--- a/doc/src/deployment.qdoc
+++ b/doc/src/deployment.qdoc
@@ -1247,7 +1247,7 @@
     \snippet doc/src/snippets/code/doc_src_deployment.qdoc 48
 
     Then we update the source code in \c tools/plugandpaint/main.cpp
-    to look for the the new plugins. After constructing the
+    to look for the new plugins. After constructing the
     QApplication, we add the following code:
 
     \snippet doc/src/snippets/code/doc_src_deployment.qdoc 49
diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc
index 03b74e6..fc3adcf 100644
--- a/doc/src/designer-manual.qdoc
+++ b/doc/src/designer-manual.qdoc
@@ -58,7 +58,8 @@
     and custom plugins allow you to use your own components with \QD.
 
     If you are new to \QD, you can take a look at the
-    \l{Getting To Know Qt Designer} document.
+    \l{Getting To Know Qt Designer} document. For a quick tutorial on how to
+    use \QD, refer to \l{A Quick Start to Qt Designer}.
 
     Qt Designer 4.5 boasts a long list of improvements. For a detailed list of
     what is new, refer \l{What's New in Qt Designer 4.5}.
@@ -235,6 +236,7 @@
     \page designer-to-know.html
     \contentspage {Qt Designer Manual}{Contents}
 
+
     \title Getting to Know Qt Designer
 
     \tableofcontents
@@ -298,12 +300,12 @@
         \row
             \i \inlineimage designer-widget-box.png
             \i \bold{Qt Designer's Widget Box}
-        
+
         The widget box provides a selection of standard Qt widgets, layouts,
         and other objects that can be used to create user interfaces on forms.
         Each of the categories in the widget box contain widgets with similar
         uses or related features.
-        
+
         \note Since Qt 4.4, new widgets have been included, e.g.,
         QPlainTextEdit, QCommandLinkButton, QScrollArea, QMdiArea, and
         QWebView.
@@ -357,7 +359,7 @@
     using a grid. The coordinates on the screenshot show the position of each
     widget within the grid.
 
-    \image addressbook-tutorial-part3-labeled-layout.png    
+    \image addressbook-tutorial-part3-labeled-layout.png
 
     \note Inside the grid, the QPushButton objects are actually nested. The
     buttons on the right are first placed in a QVBoxLayout; the buttons at the
@@ -366,7 +368,7 @@
 
     To visualize, imagine the layout as a box that shrinks as much as possible,
     attempting to \e squeeze your widgets in a neat arrangement, and, at the
-    same time, maximize the use of available space. 
+    same time, maximize the use of available space.
 
     Qt's layouts help when you:
 
@@ -408,6 +410,7 @@
     \page designer-quick-start.html
     \contentspage {Qt Designer Manual}{Contents}
 
+
     \title A Quick Start to Qt Designer
 
     Using \QD involves \bold four basic steps:
@@ -419,16 +422,14 @@
         \o  Preview the form
     \endlist
 
-    \omit
     \image rgbController-screenshot.png
-    \endomit
 
-    Suppose you would like to design a small widget (see screenshot above)
-    that contains the controls needed to manipulate Red, Green and Blue (RGB)
-    values -- a type of widget that can be seen everywhere in image
-    manipulation programs.
+    Suppose you would like to design a small widget (see screenshot above) that
+    contains the controls needed to manipulate Red, Green and Blue (RGB) values
+    -- a type of widget that can be seen everywhere in image manipulation
+    programs.
 
-   \table
+    \table
     \row
     \i \inlineimage designer-choosing-form.png
     \i \bold{Choosing a Form}
@@ -436,64 +437,64 @@
     You start by choosing \gui Widget from the \gui{New Form} dialog.
     \endtable
 
-    Then you drag three labels, three spin boxes and three vertical sliders
-    on to your form. You can roughly arrange them according to how you would
-    like them to be laid out.
 
-    \omit
     \table
-    \row \o \inlineimage rgbController-widgetBox.png
-         \o \inlineimage rgbController-arrangement.png
+    \row
+    \i  \inlineimage rgbController-arrangement.png
+    \i  \bold{Placing Widgets on a Form}
+
+    Drag three labels, three spin boxes and three vertical sliders on to your
+    form. To change the label's default text, simply double-click on it. You
+    can arrange them according to how you would like them to be laid out.
     \endtable
-    \endomit
 
     To ensure that they are laid out exactly like this in your program, you
     need to place these widgets into a layout. We will do this in groups of
-    three. Select the "RED" label. Then, hold down \key Shift while you select
+    three. Select the "RED" label. Then, hold down \key Ctrl while you select
     its corresponding spin box and slider. In the \gui{Form} menu, select
     \gui{Lay Out in a Grid}.
 
-    \omit
     \table
         \row
             \i \inlineimage rgbController-form-gridLayout.png
             \i \inlineimage rgbController-selectForLayout.png
     \endtable
-    \endomit
 
 
     Repeat the step for the other two labels along with their corresponding
-    spin boxes and sliders as well. Your form will now look similar to the
-    screenshot below.
-
-    \omit
-    \image rgbController-almostLaidOut.png
-    \endomit
+    spin boxes and sliders as well.
 
     The next step is to combine all three layouts into one \bold{main layout}.
-    It is important that your form has a main layout; otherwise, the widgets
-    on your form will not resize when your form is resized. To set the main
-    layout, \gui{Right click} anywhere on your form, outside of the three
-    separate layouts, and select \gui{Lay Out Horizontally}. Alternatively, you
-    could also select \gui{Lay Out in a Grid} -- you will still see the same
-    arrangement.
+    The main layout is the top level widget's (in this case, the QWidget)
+    layout. It is important that your top level widget has a layout; otherwise,
+    the widgets on your window will not resize when your window is resized. To
+    set the layout, \gui{Right click} anywhere on your form, outside of the
+    three separate layouts, and select \gui{Lay Out Horizontally}.
+    Alternatively, you could also select \gui{Lay Out in a Grid} -- you will
+    still see the same arrangement (shown below).
+
+    \image rgbController-final-layout.png
 
     \note Main layouts cannot be seen on the form. To check if you have a main
     layout installed, try resizing your form; your widgets should resize
-    accordingly.
+    accordingly. Alternatively, you can take a look at \QD's
+    \gui{Object Inspector}. If your top level widget does not have a layout,
+    you will see the broken layout icon next to it,
+    \inlineimage rgbController-no-toplevel-layout.png
+    .
 
     When you click on the slider and drag it to a certain value, you want the
-    spin box to display the slider's position. To do this, you need to connect
-    the slider's \l{QAbstractSlider::}{valueChanged()} signal to the spin box's
-    \l{QSpinBox::}{setValue()} slot. You also need to make the reverse
-    connections, e.g., connect the spin box's \l{QSpinBox::}{valueChanged()}
-    signal to the slider's \l{QAbstractSlider::value()}{setValue()} slot.
+    spin box to display the slider's position. To accomplish this behavior, you
+    need to connect the slider's \l{QAbstractSlider::}{valueChanged()} signal
+    to the spin box's \l{QSpinBox::}{setValue()} slot. You also need to make
+    the reverse connections, e.g., connect the spin box's \l{QSpinBox::}
+    {valueChanged()} signal to the slider's \l{QAbstractSlider::value()}
+    {setValue()} slot.
 
     To do this, you have to switch to \gui{Edit Signals/Slots} mode, either by
     pressing \key{F4} or something \gui{Edit Signals/Slots} from the \gui{Edit}
     menu.
 
-    \omit
     \table
         \row
             \i \inlineimage rgbController-signalsAndSlots.png
@@ -503,17 +504,19 @@
         \gui{Configure Connection} dialog, shown below, will pop up. Select the
         correct signal and slot and click \gui OK.
     \endtable
-    \endomit
 
-    \omit
-    \image rgbController-configureConnection.png
-    \endomit
+    \image rgbController-configure-connection1.png
 
     Repeat the step (in reverse order), clicking on the spin box and dragging
     the cursor towards the slider, to connect the spin box's
     \l{QSpinBox::}{valueChanged()} signal to the slider's
     \l{QAbstractSlider::value()}{setValue()} slot.
 
+    You can use the screenshot below as a guide to selecting the correct signal
+    and slot.
+
+    \image rgbController-configure-connection2.png
+
     Now that you have successfully connected the objects for the "RED"
     component of the RGB Controller, do the same for the "GREEN" and "BLUE"
     components as well.
@@ -521,7 +524,6 @@
     Since RGB values range between 0 and 255, we need to limit the spin box
     and slider to that particular range.
 
-    \omit
     \table
         \row
             \i \inlineimage rgbController-property-editing.png
@@ -532,21 +534,14 @@
         \l{QSpinBox::}{maximum} property. Then, click on the first vertical
         slider, you will see \l{QAbstractSlider}'s properties. Enter "255" for
         the \l{QAbstractSlider::}{maximum} property as well. Repeat this
-        process for the remaining spin boxes and sliders.
+        process for the remaining  spin boxes and sliders.
     \endtable
-    \endomit
 
-    Now, we preview your form to see how it would look in your application. To
-    preview your form, press \key{Ctrl + R} or select \gui Preview from the
-    \gui Form menu.
-
-    \omit
-    \image rgbController-preview.png
-    \endomit
-
-    Try dragging the slider - the spin box will mirror its value too (and vice
-    versa). Also, you can resize it to see how the layouts used to manage the
-    child widgets respond to different window sizes.
+    Now, we preview your form to see how it would look in your application -
+    press \key{Ctrl + R} or select \gui Preview from the \gui Form menu. Try
+    dragging the slider - the spin box will mirror its value too (and vice
+    versa). Also, you can resize it to see how the layouts that are used to
+    manage the child widgets, respond to different window sizes.
 */
 
 
@@ -788,11 +783,11 @@
            have a \c text property that can also be edited by double-clicking
            on the widget or by pressing \gui F2. \QD interprets the backslash
            (\\) character specially, enabling newline (\\n) characters to be
-           inserted into the text; the \\\\ character sequence is used to 
+           inserted into the text; the \\\\ character sequence is used to
            insert a single backslash into the text. A context menu can also be
            opened while editing, providing another way to insert special
            characters and newlines into the text.
-    \endlist    
+    \endlist
 
 
     \section2 Dynamic Properties
@@ -804,12 +799,12 @@
 
     \image designer-property-editor-toolbar.png
 
-    To add a dynamic property, clcik on the \gui Add button 
+    To add a dynamic property, clcik on the \gui Add button
     \inlineimage designer-property-editor-add-dynamic.png
-    . To remove it, click on the \gui Remove button 
+    . To remove it, click on the \gui Remove button
     \inlineimage designer-property-editor-remove-dynamic.png
      instead. You can also sort the properties alphabetically and change the
-    color groups by clickinig on the \gui Configure button 
+    color groups by clickinig on the \gui Configure button
     \inlineimage designer-property-editor-configure.png
     .
 
@@ -911,7 +906,7 @@
 
 
     \section2 Horizontal and Vertical Layouts
-    
+
     The simplest way to arrange objects on a form is to place them in a
     horizontal or vertical layout. Horizontal layouts ensure that the widgets
     within are aligned horizontally; vertical layouts ensure that they are
@@ -1138,7 +1133,7 @@
     spacers just provide spacing hints to layouts, so they cannot be connected
     to other objects.
 
-    
+
     \target HighlightedObjects
     \table
         \row
@@ -1177,7 +1172,7 @@
 
     \image designer-connection-dialog.png
 
-    To complete the connection, select a signal from the source object and a 
+    To complete the connection, select a signal from the source object and a
     slot from the destination object, then click \key OK. Click \key Cancel if
     you wish to abandon the connection.
 
@@ -1720,22 +1715,22 @@
             \i  \bold{Resource Files}
 
         Within the resource browser, you can open existing resource files or
-        create new ones. Click the \gui{Edit Resources} button 
+        create new ones. Click the \gui{Edit Resources} button
         \inlineimage designer-edit-resources-button.png
          to edit your resources. To reload resources, click on the \gui Reload
-        button 
+        button
         \inlineimage designer-reload-resources-button.png
         .
     \endtable
 
 
     Once a resource file is loaded, you can create or remove entries in it
-    using the given \gui{Add Files} 
-    \inlineimage designer-add-resource-entry-button.png 
-    and \gui{Remove Files} 
+    using the given \gui{Add Files}
+    \inlineimage designer-add-resource-entry-button.png
+    and \gui{Remove Files}
     \inlineimage designer-remove-resource-entry-button.png
      buttons, and specify resources (e.g., images) using the \gui{Add Files}
-    button 
+    button
     \inlineimage designer-add-files-button.png
     . Note that these resources must reside within the current resource file's
     directory or one of its subdirectories.
@@ -1747,15 +1742,15 @@
             \i  \inlineimage designer-edit-resource.png
             \i  \bold{Editing Resource Files}
 
-        Press the 
+        Press the
         \inlineimage designer-add-resource-entry-button.png
          button to add a new resource entry to the file. Then use the
-        \gui{Add Files} button 
+        \gui{Add Files} button
         \inlineimage designer-add-files-button.png
          to specify the resource.
 
         You can remove resources by selecting the corresponding entry in the
-        resource editor, and pressing the 
+        resource editor, and pressing the
         \inlineimage designer-remove-resource-entry-button.png
          button.
     \endtable
@@ -2563,7 +2558,7 @@ pixmap property in the property editor.
         QDesignerTaskMenuExtension is useful for custom widgets. It provides an
         extension that allows you to add custom menu entries to \QD's task
         menu.
-    
+
         The \l{designer/taskmenuextension}{Task Menu Extension} example
         illustrates how to use this class.
 
@@ -2664,7 +2659,7 @@ pixmap property in the property editor.
     function, making it able to create your extension, such as a
      \l{designer/containerextension}{MultiPageWidget} container extension.
 
-    You can either create a new QExtensionFactory and reimplement the 
+    You can either create a new QExtensionFactory and reimplement the
     QExtensionFactory::createExtension() function:
 
     \snippet doc/src/snippets/code/doc_src_designer-manual.qdoc 8
diff --git a/doc/src/emb-fonts.qdoc b/doc/src/emb-fonts.qdoc
index 3ed23c3..86e169d 100644
--- a/doc/src/emb-fonts.qdoc
+++ b/doc/src/emb-fonts.qdoc
@@ -131,7 +131,7 @@
     The Qt Prerendered Font (QPF2) is an architecture-independent,
     light-weight and non-scalable font format specific to \l{Qt for Embedded Linux}.
 
-    Nokia provides the cross-platform \c makeqpf tool, included in the
+    Nokia provides the cross-platform \l makeqpf tool, included in the
     \c tools directory of both \l {Qt} and \l{Qt for Embedded Linux}, which allows
     generation of QPF2 files from system fonts.
 
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/emb-makeqpf.qdoc b/doc/src/emb-makeqpf.qdoc
index ca33eda..8f5d10b 100644
--- a/doc/src/emb-makeqpf.qdoc
+++ b/doc/src/emb-makeqpf.qdoc
@@ -44,7 +44,10 @@
     \title makeqpf
     \ingroup qt-embedded-linux
 
-    \c makeqpf is not part of Qt 4. However, Qt 4 can still read QPF
-    files generated by Qt 2 or 3. To generate QPF files, use makeqpf from Qt 2
-    or 3.
+    \c makeqpf is a tool to generate pre-rendered fonts in QPF2 format for use on Embedded Linux.
+
+    Qt 4 can read files in QPF2 format in addition to QPF files generated by older versions of
+    \c makeqpf from Qt 2 or 3.
+
+    \sa {Qt for Embedded Linux Fonts}
 */
diff --git a/doc/src/examples/codeeditor.qdoc b/doc/src/examples/codeeditor.qdoc
index 669ab45..d218d0d 100644
--- a/doc/src/examples/codeeditor.qdoc
+++ b/doc/src/examples/codeeditor.qdoc
@@ -67,7 +67,7 @@
     QTextEdit because it is optimized for handling plain text. See
     the QPlainTextEdit class description for details.
 
-    QPlainTextEdit lets us add selections in addition to the the
+    QPlainTextEdit lets us add selections in addition to the
     selection the user can make with the mouse or keyboard. We use
     this functionality to highlight the current line. More on this
     later.
diff --git a/doc/src/examples/containerextension.qdoc b/doc/src/examples/containerextension.qdoc
index a4fbcea..6d29cf6 100644
--- a/doc/src/examples/containerextension.qdoc
+++ b/doc/src/examples/containerextension.qdoc
@@ -305,7 +305,7 @@
     MultiPageWidget class \l
     {designer/containerextension/multipagewidget.cpp}{implementation}).
     Finally, we implicitly force an update of the page's property
-    sheet by calling the the
+    sheet by calling the
     QDesignerPropertySheetExtension::setChanged() function.
 
     \snippet examples/designer/containerextension/multipagewidgetplugin.cpp 4
diff --git a/doc/src/examples/fortuneserver.qdoc b/doc/src/examples/fortuneserver.qdoc
index e6a7f85..848a3a3 100644
--- a/doc/src/examples/fortuneserver.qdoc
+++ b/doc/src/examples/fortuneserver.qdoc
@@ -45,7 +45,7 @@
 
     The Fortune Server example shows how to create a server for a simple
     network service. It is intended to be run alongside the
-    \l{network/fortuneclient}{Fortune Client} example or the the
+    \l{network/fortuneclient}{Fortune Client} example or the
     \l{network/blockingfortuneclient}{Blocking Fortune Client} example.
 
     \image fortuneserver-example.png Screenshot of the Fortune Server example
diff --git a/doc/src/examples/ftp.qdoc b/doc/src/examples/ftp.qdoc
index 9cc9cd1..7a74a37 100644
--- a/doc/src/examples/ftp.qdoc
+++ b/doc/src/examples/ftp.qdoc
@@ -172,7 +172,7 @@
     no entries were found (in which case our \c addToList() function
     would not have been called). 
 
-    Let's continue with the the \c addToList() slot:
+    Let's continue with the \c addToList() slot:
 
     \snippet examples/network/ftp/ftpwindow.cpp 10
 
@@ -190,7 +190,7 @@
 
     \snippet examples/network/ftp/ftpwindow.cpp 12
 
-    \c cdToParent() is invoked when the the user requests to go to the
+    \c cdToParent() is invoked when the user requests to go to the
     parent directory of the one displayed in the file list. After
     changing the directory, we QFtp::List its contents.
 
diff --git a/doc/src/examples/htmlinfo.qdoc b/doc/src/examples/htmlinfo.qdoc
index bf95486..af236e1 100644
--- a/doc/src/examples/htmlinfo.qdoc
+++ b/doc/src/examples/htmlinfo.qdoc
@@ -5,7 +5,37 @@
 **
 ** This file is part of the $MODULE$ of the Qt Toolkit.
 **
-** $TROLLTECH_DUAL_LICENSE$
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
diff --git a/doc/src/examples/icons.qdoc b/doc/src/examples/icons.qdoc
index 750ef2e..a81ddb9 100644
--- a/doc/src/examples/icons.qdoc
+++ b/doc/src/examples/icons.qdoc
@@ -479,7 +479,7 @@
     QTableWidget::openPersistentEditor() function to create
     comboboxes for the mode and state columns of the items.
 
-    Due to the the connection between the table widget's \l
+    Due to the connection between the table widget's \l
     {QTableWidget::itemChanged()}{itemChanged()} signal and the \c
     changeIcon() slot, the new image is automatically converted into a
     pixmap and made part of the set of pixmaps available to the icon
diff --git a/doc/src/examples/musicplayerexample.qdoc b/doc/src/examples/musicplayerexample.qdoc
index d23c1f1..9f04bf6 100644
--- a/doc/src/examples/musicplayerexample.qdoc
+++ b/doc/src/examples/musicplayerexample.qdoc
@@ -154,7 +154,7 @@
 
     \snippet examples/phonon/musicplayer/mainwindow.cpp 5
 
-    We move on to the the slots of \c MainWindow, starting with \c
+    We move on to the slots of \c MainWindow, starting with \c
     addFiles(): 
 
     \snippet examples/phonon/musicplayer/mainwindow.cpp 6
diff --git a/doc/src/examples/qobjectxmlmodel.qdoc b/doc/src/examples/qobjectxmlmodel.qdoc
index ce1dab6..37c66bc 100644
--- a/doc/src/examples/qobjectxmlmodel.qdoc
+++ b/doc/src/examples/qobjectxmlmodel.qdoc
@@ -71,7 +71,7 @@
   The query engine can only traverse two dimensional trees, because an
   XML document is always a two dimensional tree. If we want to add the
   QMetaObject tree to the node model, we have to somehow flatten it
-  into the the same plane as the QObject tree. This requires that the
+  into the same plane as the QObject tree. This requires that the
   node model class must build an auxiliary data structure and make it
   part of the two dimensional QObject node model. How to do this is
   explained in \l{Including The QMetaObject Tree}.
diff --git a/doc/src/examples/tabdialog.qdoc b/doc/src/examples/tabdialog.qdoc
index c9500af..5394b82 100644
--- a/doc/src/examples/tabdialog.qdoc
+++ b/doc/src/examples/tabdialog.qdoc
@@ -91,7 +91,7 @@
     \snippet examples/dialogs/tabdialog/tabdialog.cpp 1
     \snippet examples/dialogs/tabdialog/tabdialog.cpp 3
 
-    We arrange the the tab widget above the buttons in the dialog:
+    We arrange the tab widget above the buttons in the dialog:
 
     \snippet examples/dialogs/tabdialog/tabdialog.cpp 4
 
diff --git a/doc/src/examples/tooltips.qdoc b/doc/src/examples/tooltips.qdoc
index 5daa2b2..78b350b 100644
--- a/doc/src/examples/tooltips.qdoc
+++ b/doc/src/examples/tooltips.qdoc
@@ -353,7 +353,7 @@
     Whenever the user creates a new shape item, we want the new item
     to appear at a random position, and we use the \c
     randomItemPosition() function to calculate such a position. We
-    make sure that the item appears within the the visible area of the
+    make sure that the item appears within the visible area of the
     \c SortingBox widget, using the widget's current width and heigth
     when calculating the random coordinates.
 
diff --git a/doc/src/examples/trafficinfo.qdoc b/doc/src/examples/trafficinfo.qdoc
index c9b6890..13181cd 100644
--- a/doc/src/examples/trafficinfo.qdoc
+++ b/doc/src/examples/trafficinfo.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
 **
 ** This file is part of the documentation of the Qt Toolkit.
diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc
index eabb803..58c8b80 100644
--- a/doc/src/examples/transformations.qdoc
+++ b/doc/src/examples/transformations.qdoc
@@ -208,7 +208,7 @@
 
     After transforming the coordinate system, we draw the \c
     RenderArea's shape, and then we restore the painter state using
-    the the QPainter::restore() function (i.e. popping the saved state off
+    the QPainter::restore() function (i.e. popping the saved state off
     the stack).
 
     \snippet examples/painting/transformations/renderarea.cpp 7
diff --git a/doc/src/examples/trollprint.qdoc b/doc/src/examples/trollprint.qdoc
index 38251ee..489012e 100644
--- a/doc/src/examples/trollprint.qdoc
+++ b/doc/src/examples/trollprint.qdoc
@@ -142,7 +142,7 @@
     We can easily determine which file must be changed because the
     translator's "context" is in fact the class name for the class where
     the texts that must be changed appears. In this case the file is \c
-    printpanel.cpp, where the there are four lines to change. Add the
+    printpanel.cpp, where there are four lines to change. Add the
     second argument "two-sided" in the appropriate \c tr() calls to the
     first pair of radio buttons:
 
diff --git a/doc/src/exceptionsafety.qdoc b/doc/src/exceptionsafety.qdoc
new file mode 100644
index 0000000..4e3e89e
--- /dev/null
+++ b/doc/src/exceptionsafety.qdoc
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page exceptionsafety.html
+    \title Exception Safety
+    \ingroup architecture
+    \brief A guide to exception safety in Qt.
+
+    \bold {Preliminary warning}: Exception safety is not feature complete!
+    Common cases should work, but classes might still leak or even crash.
+
+    Qt itself will not throw exceptions. Instead, error codes are used.
+    In addition, some classes have user visible error messages, for example
+    \l QIODevice::errorString() or \l QSqlQuery::lastError().
+    This has historical and practical reasons - turning on exceptions
+    can increase the library size by over 20%.
+
+    The following sections describe Qt's behavior if exception support is
+    enabled at compile time.
+
+    \tableofcontents
+
+    \section1 Exception safe modules
+
+    \section2 Containers
+    
+    Qt's \l{container classes} are generally exception neutral. They pass any
+    exception that happens within their contained type \c T to the user
+    while keeping their internal state valid.
+
+    Example:
+
+    \code
+    QList<QString> list;
+    ...
+    try {
+        list.append("hello");
+    } catch (...) {
+    }
+    // list is safe to use - the exception did not affect it.
+    \endcode
+
+    Exceptions to that rule are containers for types that can throw during assignment
+    or copy constructions. For those types, functions that modify the container as well as
+    returning a value, are unsafe to use:
+
+    \code
+    MyType s = list.takeAt(2);
+    \endcode
+
+    If an exception occurs during the assignment of \c s, the value at index 2 is already
+    removed from the container, but hasn't been assigned to \c s yet. It is lost
+    without chance of recovery.
+
+    The correct way to write it:
+
+    \code
+    MyType s = list.at(2);
+    list.removeAt(2);
+    \endcode
+
+    If the assignment throws, the container still contains the value, no data loss occured.
+
+    Note that implicitly shared Qt classes will not throw in their assignment
+    operators or copy constructors, so the limitation above does not apply.
+
+    \section1 Out of memory handling
+
+    Most desktop operating systems overcommit memory. This means that \c malloc()
+    or \c{operator new} return a valid pointer, even though there is not enough
+    memory available at allocation time. On such systems, no exception of type
+    \c std::bad_alloc is thrown.
+
+    On all other operating systems, Qt will throw an exception of type std::bad_alloc
+    if any allocation fails. Allocations can fail if the system runs out of memory or
+    doesn't have enough continuous memory to allocate the requested size.
+
+    Exceptions to that rule are documented. As an example, \l QImage::create()
+    returns false if not enough memory exists instead of throwing an exception.
+
+    \section1 Recovering from exceptions
+
+    Currently, the only supported use case for recovering from exceptions thrown
+    within Qt (for example due to out of memory) is to exit the event loop and do 
+    some cleanup before exiting the application.
+
+    Typical use case:
+
+    \code
+    QApplication app(argc, argv);
+    ...
+    try {
+        app.exec();
+    } catch (const std::bad_alloc &) {
+        // clean up here, e.g. save the session
+        // and close all config files.
+
+        return 0; // exit the application
+    }
+    \endcode
+
+    After an exception is thrown, the connection to the windowing server
+    might already be closed. It is not safe to call a GUI related function
+    after catching an exception.
+*/
diff --git a/doc/src/images/designer-choosing-form.png b/doc/src/images/designer-choosing-form.png
index fa6e470..bee4b29 100644
--- a/doc/src/images/designer-choosing-form.png
+++ b/doc/src/images/designer-choosing-form.png
diff --git a/doc/src/images/inputdialogs.png b/doc/src/images/inputdialogs.png
index 135c2f6..8bda185 100644
--- a/doc/src/images/inputdialogs.png
+++ b/doc/src/images/inputdialogs.png
diff --git a/doc/src/images/rgbController-arrangement.png b/doc/src/images/rgbController-arrangement.png
new file mode 100644
index 0000000..d9e8bab
--- /dev/null
+++ b/doc/src/images/rgbController-arrangement.png
diff --git a/doc/src/images/rgbController-configure-connection1.png b/doc/src/images/rgbController-configure-connection1.png
new file mode 100644
index 0000000..4e5dcf2
--- /dev/null
+++ b/doc/src/images/rgbController-configure-connection1.png
diff --git a/doc/src/images/rgbController-configure-connection2.png b/doc/src/images/rgbController-configure-connection2.png
new file mode 100644
index 0000000..f3fcc62
--- /dev/null
+++ b/doc/src/images/rgbController-configure-connection2.png
diff --git a/doc/src/images/rgbController-final-layout.png b/doc/src/images/rgbController-final-layout.png
new file mode 100644
index 0000000..d32a93e
--- /dev/null
+++ b/doc/src/images/rgbController-final-layout.png
diff --git a/doc/src/images/rgbController-form-gridLayout.png b/doc/src/images/rgbController-form-gridLayout.png
new file mode 100644
index 0000000..c8f3dcf
--- /dev/null
+++ b/doc/src/images/rgbController-form-gridLayout.png
diff --git a/doc/src/images/rgbController-no-toplevel-layout.png b/doc/src/images/rgbController-no-toplevel-layout.png
new file mode 100644
index 0000000..0a9bc29
--- /dev/null
+++ b/doc/src/images/rgbController-no-toplevel-layout.png
diff --git a/doc/src/images/rgbController-property-editing.png b/doc/src/images/rgbController-property-editing.png
new file mode 100644
index 0000000..64fc500
--- /dev/null
+++ b/doc/src/images/rgbController-property-editing.png
diff --git a/doc/src/images/rgbController-screenshot.png b/doc/src/images/rgbController-screenshot.png
new file mode 100644
index 0000000..6019233
--- /dev/null
+++ b/doc/src/images/rgbController-screenshot.png
diff --git a/doc/src/images/rgbController-selectForLayout.png b/doc/src/images/rgbController-selectForLayout.png
new file mode 100644
index 0000000..7a8e184
--- /dev/null
+++ b/doc/src/images/rgbController-selectForLayout.png
diff --git a/doc/src/images/rgbController-signalsAndSlots.png b/doc/src/images/rgbController-signalsAndSlots.png
new file mode 100644
index 0000000..2ba3aba
--- /dev/null
+++ b/doc/src/images/rgbController-signalsAndSlots.png
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 4ead9e4..23e8623 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -153,6 +153,7 @@
         <li><a href="overviews.html">All Overviews and HOWTOs</a></li>
         <li><a href="gallery.html">Qt Widget Gallery</a></li>
         <li><a href="http://doc.trolltech.com/extras/qt43-class-chart.pdf">Class Chart</a></li>
+        <li><a href="qtglobal.html">Qt Global Declarations</a></li>
         </ul>
         </td>
         <td valign="top">
@@ -207,10 +208,10 @@
         <td valign="top">
         <ul>
         <li><a href="http://www.qtsoftware.com/products/add-on-products">Qt Solutions</a></li>
-        <li><a href="http://www.qtsoftware.com/products/qt/3rdparty/">Partner Add-ons</a></li>
+        <li><a href="http://www.qtsoftware.com/products/appdev">Partner Add-ons</a></li>
         <li><a href="http://qt-apps.org">Third-Party Qt Components (qt-apps.org)</a></li>
-        <li><a href="http://www.qtsoftware.com/support/">Support</a></li>
-        <li><a href="http://www.qtsoftware.com/support/training/">Training</a></li>
+        <li><a href="http://www.qtsoftware.com/support-services/support-services/">Support</a></li>
+        <li><a href="http://www.qtsoftware.com/support-services/training/">Training</a></li>
         </ul>
         </td>
         <td valign="top">
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 85ea20c..13af50c 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -499,32 +499,66 @@ in the \l{Qt for Windows CE Requirements} document.
     We hope you will enjoy using Qt. Good luck!
 */
 
-/*! \page install-S60.html
+/*! \page install-S60-installer.html
 
-\title Installing Qt on S60
-\ingroup installation
+\title Installing Qt on S60 using binary package
 \ingroup qts60
-\brief How to install Qt on S60.
+\brief How to install Qt on S60 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.
 
 \list 1
-    \o  Install needed IDE and SDKs
 
-        Make sure you have the following installed:
-        \list
-            \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}
-            \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++ for S60 3rd Edition} (automatically included in 3.2 and higher)
-        \endlist
+    \o  Install Qt
 
-        These instructions assume the above tools are installed and
-        that the enviroment variables for your compiler are set correctly.
+        Run \c{qt-s60-%VERSION%.exe} and follow the instructions.
 
-        \note Users of \bold{S60 Platform SDK 3rd Edition FP1} also need special updates. The update can be found
-        \l{http://pepper.troll.no/s60prereleases/patches/}{here}.
+        \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.
 
-        \note The wsini.ini provided with the \bold{S60 Platform SDK 5th Edition v0.9}
-        needs to be updated for correct font rendering in the emulator. The update can be found
-        \l{http://pepper.troll.no/s60prereleases/patches/}{here}.
+    \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 in the Qt installation
+        directory. In Windows Explorer right click on the \c{.sis} 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.
+        Open the "Qt for S60 Command Prompt" from the Start menu and type:
+        
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 25
+        
+        To run the demos on the emulator simply navigate to the directory of the demo 
+        you want to see and run:
+
+        \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}.
+
+    We hope you will enjoy using Qt.
+
+\endlist
+
+*/
+/*! \page install-S60.html
+
+\title Installing Qt on S60
+\ingroup installation
+\ingroup qts60
+\brief How to install Qt on S60
+
+\note Qt for S60 has some requirements that are given in more detail
+in the \l{Qt for S60 Requirements} document.
+
+\note This document describes how to install Qt for S60 from the source package. 
+Go \l{Installing Qt on S60 using binary package}{here} for instructions on how to install 
+Qt using binary package.
+
+\list 1
 
     \o  Install Qt
 
@@ -561,11 +595,9 @@ in the \l{Qt for Windows CE Requirements} document.
 
     \o  Build Qt
 
-        The Qt libraries comes pre-built for real devices.
-        If you are using a 3.x S60 SDK, install \c{qts60binaries\3.x\qtlibs-%VERSION%.exe}
-        into the S60 SDK root directory. For example: \c{C:\Symbian\9.2\S60_3rd_FP1_2\}
-        If you are using a 5.0 S60 SDK, install \c{qts60binaries\5.0\qtlibs-%VERSION%.exe}
-        into the S60 SDK root directory. For example: \c{C:\S60\devices\S60_5th_Edition_SDK_v0.9\}
+        To build Qt for the device, type:
+
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 28
         
         To build Qt for the emulator, type:
 
@@ -576,33 +608,29 @@ in the \l{Qt for Windows CE Requirements} document.
     \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
-        the Qt libraries on the device.
-        For 3.x devices install \c{qts60binaries\3.x\qt_libs_armv5_udeb.sisx}
-        For 5.0 devices install \c{qts60binaries\5.0\qt_libs_armv5_udeb.sisx}
-	included in this package to the device. Then type:
+        to try out. An excellent starting point is the "fluidlauncher"
+        demo. To run the demo on a real device, you first have to install
+        the Qt libraries on the device:
+        
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 29
 
-        \snippet doc/src/snippets/code/doc_src_installation.qdoc 25
+        \note You will need to supply certificate that allows installation 
+        of binaries with "All -Tcb" capability to your device. 
 
-        This will create a self-signed \c fluidlauncher_gcce_udeb.sisx and
-        install it to your device.
-        
-        \note You can specify your own certificate and key files as additional parameters to
-        \c createpackage if default ones are not suitable.
- 
-         To run the demos on the emulator simply run:
+        Similarly, install fluidlauncher to the device:
 
-         \snippet doc/src/snippets/code/doc_src_installation.qdoc 27
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 30
 
-         Or, if you need to supply arguments to the program, navigate to
-         \c{%EPOCROOT%\Epoc32\release\winscw\udeb\} and start any of the
-         Qt demos located there, for example:
+        This will create a self-signed \c fluidlauncher_armv5_urel.sis and
+        install it to your device.
+        
+        To run the demos on the emulator simply navigate to the directory of the demo 
+        you want to see and run:
 
-         \snippet doc/src/snippets/code/doc_src_installation.qdoc 26
+        \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 S60,
+        see \l{S60 - Introduction to using Qt}.
 
     We hope you will enjoy using Qt.
 
@@ -632,6 +660,7 @@ in the \l{Qt for Windows CE Requirements} document.
     \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 Windows CE Requirements}
     \o \l{Qt for Windows Requirements}
     \o \l{Qt for X11 Requirements}
@@ -848,8 +877,6 @@ in the \l{Qt for Windows CE Requirements} document.
     \header                                        \o Minimal \o Normal \o Minimal \o Normal \o Minimal \o Normal \o Minimal \o Normal 
     \row    \o linux-x86-g++ \o GCC 4.2.4          \o 1.7M    \o 2.7M   \o 3.3M    \o 9.9M   \o 653K    \o 1.1M   \o N/A     \o 17M
     \row    \o linux-arm-g++ \o GCC 4.1.1          \o 1.9M    \o 3.2M   \o 4.1M    \o 11M    \o 507K    \o 1.0M   \o N/A     \o 17M
-    \row    \o linux-arm-g++ (thumb)
-                             \o GCC 4.1.1          \o 1.7M    \o 2.8M   \o 4.0M    \o 9.8M   \o 409K    \o 796K   \o N/A     \o 17M
     \row    \o linux-mips-g++ (MIPS32)
                              \o GCC 4.2.4          \o 2.0M    \o 3.2M   \o 4.5M    \o 12M    \o 505K    \o 1003K  \o N/A     \o 21M
     \endtable
@@ -867,3 +894,34 @@ in the \l{Qt for Windows CE Requirements} document.
     enables the use of the Record extension to the X protocol to be used in
     applications.
 */
+
+/*!
+    \page requirements-s60.html
+    \title Qt for S60 Requirements
+    \ingroup installation
+    \brief Setting up the S60 environment for Qt.
+    \previouspage General Qt Requirements
+
+    Qt for S60 requires the following software installed on your development PC:
+    \list
+        \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}
+        \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.
+        \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 616] 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++:
+    \list
+        \o \c{nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis}
+        \o \c{nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis}
+        \o \c{nokia_plugin\opencpp\s60opencppsis\stdcpp_s60_<version>.sis}
+    \endlist
+
+    \note Users of \bold{S60 Platform SDK 3rd Edition FP1} also need special updates. The update can be found
+    \l{http://pepper.troll.no/s60prereleases/patches/}{here}.
+
+    \sa {Known Issues in %VERSION%}
+*/
diff --git a/doc/src/licenses.qdoc b/doc/src/licenses.qdoc
index 1c3f6d2..a11c071 100644
--- a/doc/src/licenses.qdoc
+++ b/doc/src/licenses.qdoc
@@ -45,7 +45,7 @@
     \ingroup licensing
     \brief Information about other licenses used for Qt components and third-party code.
 
-    Qt contains some code that is not provided under the the
+    Qt contains some code that is not provided under the
     \l{GNU General Public License (GPL)},
     \l{GNU Lesser General Public License (LGPL)} or the
     \l{Qt Commercial Editions}{Qt Commercial License Agreement}, but rather under
diff --git a/doc/src/mac-differences.qdoc b/doc/src/mac-differences.qdoc
index 573e62d..5849850 100644
--- a/doc/src/mac-differences.qdoc
+++ b/doc/src/mac-differences.qdoc
@@ -128,7 +128,7 @@
 
     If you want to build a new dynamic library combining the Qt 4
     dynamic libraries, you need to introduce the \c{ld -r} flag. Then
-    relocation information is stored in the the output file, so that
+    relocation information is stored in the output file, so that
     this file could be the subject of another \c ld run. This is done
     by setting the \c -r flag in the \c .pro file, and the \c LFLAGS
     settings.
diff --git a/doc/src/model-view-programming.qdoc b/doc/src/model-view-programming.qdoc
index bf0c1c8..8874cfa 100644
--- a/doc/src/model-view-programming.qdoc
+++ b/doc/src/model-view-programming.qdoc
@@ -249,7 +249,7 @@
     provide an API that allows you to sort your model data
     programmatically. In addition, you can enable interactive sorting
     (i.e. allowing the users to sort the data by clicking the view's
-    headers), by connecting the QHeaderView::sectionClicked() signal
+    headers), by connecting the QHeaderView::sortIndicatorChanged() signal
     to the QTableView::sortByColumn() slot or the
     QTreeView::sortByColumn() slot, respectively.
 
diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc
index 501b5a5..dd37fe2 100644
--- a/doc/src/phonon-api.qdoc
+++ b/doc/src/phonon-api.qdoc
@@ -2973,7 +2973,7 @@
 
     \value ToggledHint
     If this hint is set it means that
-    the the control has only two states: zero and non-zero
+    the control has only two states: zero and non-zero
     (see isToggleControl()).
 
     \value LogarithmicHint
diff --git a/doc/src/platform-notes.qdoc b/doc/src/platform-notes.qdoc
index c8046c4..53db855 100644
--- a/doc/src/platform-notes.qdoc
+++ b/doc/src/platform-notes.qdoc
@@ -512,6 +512,19 @@
 */
 
 /*!
+    \page platform-notes-symbian.html
+    \title Platform Notes - Symbian
+    \contentspage Platform Notes
+
+    This page contains information about the Symbian platforms Qt is currently known
+    to run on. More information about the combinations of platforms and compilers
+    supported by Qt can be found on the \l{Supported Platforms} page.
+
+    For information about mixing exceptions with symbian leaves,
+    see \l{Exception Safety with Symbian}
+*/
+
+/*!
     \page platform-notes-embedded-linux.html
     \title Platform Notes - Embedded Linux
     \contentspage Platform Notes
diff --git a/doc/src/porting4-overview.qdoc b/doc/src/porting4-overview.qdoc
index b0146a6..462f849 100644
--- a/doc/src/porting4-overview.qdoc
+++ b/doc/src/porting4-overview.qdoc
@@ -364,4 +364,10 @@
     In Qt 4.2 and later, \l{Qt Style Sheets} can be used to
     implement many common modifications to existing styles, and
     this may be sufficient for Qt 3 applications.
+
+    \section2 Events
+    In Qt 3, QCloseEvents were not accepted by default. In Qt 4,
+    the event handler QWidget::closeEvent() receives QCloseEvents,
+    and accepts them by default closing the application. To avoid 
+    this, please reimplement QWidget::closeEvent().  
 */
diff --git a/doc/src/q3valuelist.qdoc b/doc/src/q3valuelist.qdoc
index be315c2..e3681af 100644
--- a/doc/src/q3valuelist.qdoc
+++ b/doc/src/q3valuelist.qdoc
@@ -108,7 +108,7 @@
     pointing to the removed member become invalid. Inserting into the
     list does not invalidate any iterator. For convenience, the
     function last() returns a reference to the last item in the list,
-    and first() returns a reference to the the first item. If the
+    and first() returns a reference to the first item. If the
     list is empty(), both last() and first() have undefined behavior
     (your application will crash or do unpredictable things). Use
     last() and first() with caution, for example:
diff --git a/doc/src/qalgorithms.qdoc b/doc/src/qalgorithms.qdoc
index b33c250..90289f9 100644
--- a/doc/src/qalgorithms.qdoc
+++ b/doc/src/qalgorithms.qdoc
@@ -59,7 +59,7 @@
 
     If STL is available on all your target platforms, you can use the
     STL algorithms instead of their Qt counterparts. One reason why
-    you might want to use the the STL algorithms is that STL provides
+    you might want to use the STL algorithms is that STL provides
     dozens and dozens of algorithms, whereas Qt only provides the most
     important ones, making no attempt to duplicate functionality that
     is already provided by the C++ standard.
diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc
index ff56dad..c26d5f2 100644
--- a/doc/src/qmake-manual.qdoc
+++ b/doc/src/qmake-manual.qdoc
@@ -1474,7 +1474,14 @@
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 34
 
     See also \l{#SOURCES}{SOURCES}.
-
+    
+    \target ICON
+    \section1 ICON
+    
+    This variable is used only in MAC and S60 to set the application icon.
+    Please see \l{Setting the Application Icon}{the application icon documentation}
+    for more information.
+    
     \target INCLUDEPATH
     \section1 INCLUDEPATH
 
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 84b3a01..c063670 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -2412,6 +2412,8 @@
     \value ImhNoPredictiveText       Do not use predictive text (i.e. dictionary lookup) while typing.
     \value ImhDialableCharactersOnly Only characters suitable for phone dialling are allowed.
 
+    \value ImhExclusiveInputMask     A mask to test for the presence of any flags ending with \c Only.
+
     \note If several flags ending with \c Only are ORed together, the resulting character set will
           consist of the union of the specified sets. For instance specifying \c ImhNumbersOnly and
           \c ImhUppercaseOnly would yield a set consisting of numbers and uppercase letters.
@@ -2426,12 +2428,11 @@
 
     \value ImMicroFocus       The rectangle covering the area of the input cursor in widget coordinates.
     \value ImFont             The currently used font for text input.
-    \value ImCursorPosition   The logical position of the cursor within the text surrounding the input area (see ImSurroundingText).
-                              If any text is selected, the position returned will be at the logical end of the
-                              selection, even if the real cursor is located at the logical start.
+    \value ImCursorPosition   The logical position of the cursor within the text surrounding the input area (see \c ImSurroundingText).
     \value ImSurroundingText  The plain text around the input area, for example the current paragraph.
     \value ImCurrentSelection The currently selected text.
     \value ImMaximumTextLength The maximum number of characters that the widget can hold. If there is no limit, QVariant() is returned.
+    \value ImAnchorPosition   The position of the selection anchor. This may be less or greater than \c ImCursorPosition, depending on which side of selection the cursor is. If there is no selection, it returns the same as \c ImCursorPosition.
 */
 
 /*!
diff --git a/doc/src/qset.qdoc b/doc/src/qset.qdoc
index afbedc3..6326219 100644
--- a/doc/src/qset.qdoc
+++ b/doc/src/qset.qdoc
@@ -685,11 +685,12 @@
 */
 
 /*!
-    \typedef QSet::iterator::iterator_category
-    \typedef QSet::const_iterator::iterator_category
+  \typedef QSet::iterator::iterator_category
+  \typedef QSet::const_iterator::iterator_category
 
-    \internal
-*/
+  Synonyms for \e {std::bidirectional_iterator_tag} indicating
+  these iterators are bidirectional iterators.
+ */
 
 /*!
     \typedef QSet::iterator::difference_type
diff --git a/doc/src/qstyles.qdoc b/doc/src/qstyles.qdoc
new file mode 100644
index 0000000..e17097a
--- /dev/null
+++ b/doc/src/qstyles.qdoc
@@ -0,0 +1,261 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+/*!
+    \class QMacStyle
+    \brief The QMacStyle class provides a Mac OS X style using the Apple Appearance Manager.
+
+    \ingroup appearance
+
+    This class is implemented as a wrapper to the HITheme
+    APIs, allowing applications to be styled according to the current
+    theme in use on Mac OS X. This is done by having primitives
+    in QStyle implemented in terms of what Mac OS X would normally theme.
+
+    \warning This style is only available on Mac OS X because it relies on the
+    HITheme APIs.
+
+    There are additional issues that should be taken
+    into consideration to make an application compatible with the
+    \link http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/index.html
+    Apple Human Interface Guidelines \endlink. Some of these issues are outlined
+    below.
+
+    \list
+
+    \i Layout - The restrictions on window layout are such that some
+    aspects of layout that are style-dependent cannot be achieved
+    using QLayout. Changes are being considered (and feedback would be
+    appreciated) to make layouts QStyle-able. Some of the restrictions
+    involve horizontal and vertical widget alignment and widget size
+    (covered below).
+
+    \i Widget size - Mac OS X allows widgets to have specific fixed sizes.  Qt
+    does not fully implement this behavior so as to maintain cross-platform
+    compatibility. As a result some widgets sizes may be inappropriate (and
+    subsequently not rendered correctly by the HITheme APIs).The
+    QWidget::sizeHint() will return the appropriate size for many
+    managed widgets (widgets enumerated in \l QStyle::ContentsType).
+
+    \i Effects - QMacStyle uses HITheme for performing most of the drawing, but
+    also uses emulation in a few cases where HITheme does not provide the
+    required functionality (for example, tab bars on Panther, the toolbar
+    separator, etc). We tried to make the emulation as close to the original as
+    possible. Please report any issues you see in effects or non-standard
+    widgets.
+
+    \endlist
+
+    There are other issues that need to be considered in the feel of
+    your application (including the general color scheme to match the
+    Aqua colors). The Guidelines mentioned above will remain current
+    with new advances and design suggestions for Mac OS X.
+
+    Note that the functions provided by QMacStyle are
+    reimplementations of QStyle functions; see QStyle for their
+    documentation.
+
+    \img qmacstyle.png
+    \sa QWindowsXPStyle, QWindowsStyle, QPlastiqueStyle, QCDEStyle, QMotifStyle
+*/
+
+
+/*!
+    \enum QMacStyle::WidgetSizePolicy
+
+    \value SizeSmall
+    \value SizeLarge
+    \value SizeMini
+    \value SizeDefault
+    \omitvalue SizeNone
+*/
+
+/*! \fn QMacStyle::QMacStyle()
+    Constructs a QMacStyle object.
+*/
+
+/*! \fn QMacStyle::~QMacStyle()
+    Destructs a QMacStyle object.
+*/
+
+/*! \fn void QMacStyle::polish(QPalette &pal)
+    \reimp 
+*/
+
+/*! \fn void QMacStyle::polish(QApplication *)
+    \reimp 
+*/
+
+/*! \fn void QMacStyle::unpolish(QApplication *)
+    \reimp 
+*/
+
+/*! \fn void QMacStyle::polish(QWidget* w)
+    \reimp 
+*/
+
+/*! \fn void QMacStyle::unpolish(QWidget* w)
+    \reimp 
+*/
+
+/*! \fn int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QWidget *widget) const
+    \reimp 
+*/
+
+/*! \fn QPalette QMacStyle::standardPalette() const
+    \reimp 
+*/
+
+/*! \fn int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w, QStyleHintReturn *hret) const
+    \reimp 
+*/
+
+/*! \fn QPixmap QMacStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const
+    \reimp 
+*/
+
+/*! \fn QPixmap QMacStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const
+    \reimp 
+*/
+
+/*!
+    \enum QMacStyle::FocusRectPolicy
+
+    This type is used to signify a widget's focus rectangle policy.
+
+    \value FocusEnabled  show a focus rectangle when the widget has focus.
+    \value FocusDisabled  never show a focus rectangle for the widget.
+    \value FocusDefault  show a focus rectangle when the widget has
+    focus and the widget is a QSpinWidget, QDateTimeEdit, QLineEdit,
+    QListBox, QListView, editable QTextEdit, or one of their
+    subclasses.
+*/
+
+/*! \fn void QMacStyle::setFocusRectPolicy(QWidget *w, FocusRectPolicy policy)
+    \obsolete
+    Sets the focus rectangle policy of \a w. The \a policy can be one of
+    \l{QMacStyle::FocusRectPolicy}.
+
+    This is now simply an interface to the Qt::WA_MacShowFocusRect attribute and the
+    FocusDefault value does nothing anymore. If you want to set a widget back
+    to its default value, you must save the old value of the attribute before
+    you change it.
+
+    \sa focusRectPolicy() QWidget::setAttribute()
+*/
+
+/*! \fn QMacStyle::FocusRectPolicy QMacStyle::focusRectPolicy(const QWidget *w)
+    \obsolete
+    Returns the focus rectangle policy for the widget \a w.
+
+    The focus rectangle policy can be one of \l{QMacStyle::FocusRectPolicy}.
+
+    In 4.3 and up this function will simply test for the
+    Qt::WA_MacShowFocusRect attribute and will never return
+    QMacStyle::FocusDefault.
+
+    \sa setFocusRectPolicy(), QWidget::testAttribute()
+*/
+
+/*! \fn void QMacStyle::setWidgetSizePolicy(const QWidget *widget, WidgetSizePolicy policy)
+
+    \obsolete
+
+    Call QWidget::setAttribute() with Qt::WA_MacMiniSize, Qt::WA_MacSmallSize,
+    or Qt::WA_MacNormalSize instead.
+*/
+
+/*! \fn QMacStyle::WidgetSizePolicy QMacStyle::widgetSizePolicy(const QWidget *widget)
+    \obsolete
+
+    Call QWidget::testAttribute() with Qt::WA_MacMiniSize, Qt::WA_MacSmallSize,
+    or Qt::WA_MacNormalSize instead.
+*/
+
+/*! \fn void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const
+
+    \reimp 
+*/
+
+/*! \fn void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter *p, const QWidget *w) const
+
+    \reimp 
+*/
+
+/*! \fn QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt, const QWidget *widget) const
+
+    \reimp 
+*/
+
+/*! \fn void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const
+    \reimp 
+*/
+
+/*! \fn QStyle::SubControl QMacStyle::hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, const QPoint &pt, const QWidget *widget) const
+    \reimp 
+*/
+
+/*! \fn QRect QMacStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const
+    \reimp 
+*/
+
+/*! \fn QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &csz, const QWidget *widget) const
+    \reimp 
+*/
+
+/*! \fn void QMacStyle::drawItemText(QPainter *p, const QRect &r, int flags, const QPalette &pal, bool enabled, const QString &text, QPalette::ColorRole textRole) const
+    \reimp 
+*/
+
+/*! \fn bool QMacStyle::event(QEvent *e)
+    \reimp 
+*/
+
+/*! \fn QIcon QMacStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt, const QWidget *widget) const
+    \internal
+*/
+
+/*! \fn int QMacStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const
+
+  \internal
+*/
+
diff --git a/doc/src/qtdesigner.qdoc b/doc/src/qtdesigner.qdoc
index 7e3b619..9699c5b 100644
--- a/doc/src/qtdesigner.qdoc
+++ b/doc/src/qtdesigner.qdoc
@@ -632,7 +632,7 @@
 /*!
     \fn void QDesignerContainerExtension::setCurrentIndex(int index)
 
-    Sets the the currently selected page in the container to be the
+    Sets the currently selected page in the container to be the
     page at the given \a index in the extension's list of pages.
 
     \sa currentIndex()
diff --git a/doc/src/qtscriptdebugger-manual.qdoc b/doc/src/qtscriptdebugger-manual.qdoc
index 3dfe879..75d87f8 100644
--- a/doc/src/qtscriptdebugger-manual.qdoc
+++ b/doc/src/qtscriptdebugger-manual.qdoc
@@ -367,7 +367,7 @@
   \section3 continue
 
   Continues execution normally, i.e, gives the execution control over
-  the script back the the QScriptEngine.
+  the script back to the QScriptEngine.
 
   \section3 eval <program>
 
diff --git a/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc
index a574355..537b37d 100644
--- a/doc/src/s60-introduction.qdoc
+++ b/doc/src/s60-introduction.qdoc
@@ -5,7 +5,37 @@
 **
 ** This file is part of the $MODULE$ of the Qt Toolkit.
 **
-** $TROLLTECH_DUAL_LICENSE$
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
@@ -20,18 +50,21 @@
     \tableofcontents
 
     \section1 Required tools
+    
+    See \l{Qt for S60 Requirements} to see what tools are required to use Qt for S60.
 
-    In order to use Qt for S60 you need to have a typical S60 development
-    setup. See \l{Qt for S60 Requirements} for the details.
-
-    \section1 Installing Qt
+    \section1 Installing Qt and running demos
+    
+    Follow the instructions found in \l{Installing Qt on S60 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}.
+    Follow the instructions found in \l{Installing Qt on S60} 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}
-    and \l{Qt Tutorial}. In general, the difference between developing a
+    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
     by Qt is not that big.
 
@@ -71,7 +104,7 @@
 
     To install your own applications on hardware, Qt comes with a tool called
     \c createpackage. When used on the \c .pkg files created by qmake, it
-    will produce a \c .sisx file that can be installed to the device. For
+    will produce a signed \c .sis file that can be installed to the device. For
     example:
 
     \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 2
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 2930317..489016d 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -137,22 +137,29 @@ configure -platform win32-mwc -xplatform symbian-abld
 make debug-winscw
 //! [24]
 
-
 //! [25]
 cd examples
-make debug-gcce
+qmake
+make
 cd ..\demos
-
-make debug-gcce
-cd embedded\fluidlauncher
-createpackage -i fluidlauncher_gcce_udeb.pkg
+qmake
+make 
 //! [25]
 
-
-//! [26]
-wiggly.exe -small-screen
-//! [26]
-
 //! [27]
 make run
 //! [27]
+
+//! [28]
+make release-armv5
+//! [28]
+
+//! [29]
+cd src\s60installs
+createpackage -i qt_libs_armv5_urel.pkg <certificate file> <certificate key file>
+//! [29]
+
+//! [30]
+cd embedded\fluidlauncher
+createpackage -i fluidlauncher_armv5_urel.pkg
+//! [30]
diff --git a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
new file mode 100644
index 0000000..05377dd
--- /dev/null
+++ b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
@@ -0,0 +1,64 @@
+//! [0]
+void myFunction(bool useSubClass)
+{
+    MyClass *p = useSubClass ? new MyClass() : new MySubClass;
+    QIODevice *device = handsOverOwnership();
+    QIODevi
+
+    if (m_value > 3) {
+        delete p;
+        delete device;
+        return;
+    }
+
+    try {
+        process(device);
+    }
+    catch (...) {
+        delete p;
+        delete device;
+        throw;
+    }
+
+    delete p;
+    delete device;
+}
+//! [0]
+
+//! [1]
+void myFunction(bool useSubClass)
+{
+    QScopedPointer<MyClass> p(useSubClass ? new MyClass() : new MySubClass);
+    QScopedPointer<QIODevice> device(handsOverOwnership());
+
+    if (m_value > 3)
+        return;
+
+    process(device);
+}
+//! [1]
+
+//! [2]
+    const QWidget *const p = new QWidget();
+    // is equivalent to:
+    const QScopedPointer<const QWidget> p(new QWidget());
+
+    QWidget *const p = new QWidget();
+    // is equivalent to:
+    const QScopedPointer<QWidget> p(new QWidget());
+
+    QWidget *const p = new QWidget();
+    // is equivalent to:
+    const QScopedPointer<QWidget> p(new QWidget());
+
+    const QWidget *p = new QWidget();
+    // is equivalent to:
+    QScopedPointer<const QWidget> p(new QWidget());
+
+//! [2]
+
+//! [3]
+if (scopedPointer) {
+    ...
+}
+//! [3]
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
index a57de9d..d9e38ed 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
+++ b/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
@@ -6,7 +6,7 @@ public:
     {
         qreal penWidth = 1;
         return QRectF(-10 - penWidth / 2, -10 - penWidth / 2,
-                      20 + penWidth / 2, 20 + penWidth / 2);
+                      20 + penWidth, 20 + penWidth);
     }
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
diff --git a/doc/src/snippets/picture/picture.cpp b/doc/src/snippets/picture/picture.cpp
index 07cedbf..be171c6 100644
--- a/doc/src/snippets/picture/picture.cpp
+++ b/doc/src/snippets/picture/picture.cpp
@@ -66,7 +66,7 @@ int main()
         QPicture picture;
         picture.load("drawing.pic");           // load picture
         QPainter painter;
-        painter.begin(&myWidget);              // paint in myWidget
+        painter.begin(&myImage);               // paint in myImage
         painter.drawPicture(0, 0, picture);    // draw the picture at (0,0)
         painter.end();                         // painting done
 //! [1]
diff --git a/doc/src/stylesheet.qdoc b/doc/src/stylesheet.qdoc
index c0d13da..4060f33 100644
--- a/doc/src/stylesheet.qdoc
+++ b/doc/src/stylesheet.qdoc
@@ -332,7 +332,7 @@
     respect to the reference element.
 
     Once positioned, they are treated the same as widgets and can be styled
-    using the the \l{box model}.
+    using the \l{box model}.
 
     See the \l{List of Sub-Controls} below for a list of supported
     sub-controls, and \l{Customizing the QPushButton's Menu Indicator
@@ -398,7 +398,7 @@
     (usually) refers to a single object, not to all instances of a
     class.
 
-    Similarly, selectors with pseudo-states are more specific that
+    Similarly, selectors with pseudo-states are more specific than
     ones that do not specify pseudo-states. Thus, the following style
     sheet specifies that a \l{QPushButton} should have white text
     when the mouse is hovering over it, otherwise red text:
@@ -653,7 +653,7 @@
     \target sub controls
     \section1 Sub-controls
 
-    A widget is considered as a heirarchy (tree) of subcontrols drawn on top 
+    A widget is considered as a hierarchy (tree) of subcontrols drawn on top
     of each other. For example, the QComboBox draws the drop-down sub-control
     followed by the down-arrow sub-control. A QComboBox is thus rendered as
     follows:
@@ -671,7 +671,7 @@
     \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin}
     properties.
     
-    Once positioned, sub-controls can be styled using the the \l{box model}.
+    Once positioned, sub-controls can be styled using the \l{box model}.
 
     \note With complex widgets such as QComboBox and QScrollBar, if one
     property or sub-control is customized, \bold{all} the other properties or
@@ -1154,7 +1154,7 @@
            \l{#pane-sub}{::pane} subcontrol. The left and right
            corners are styled using the \l{#left-corner-sub}{::left-corner}
            and \l{#right-corner-sub}{::right-corner} respectively.
-           The position of the the tab bar is controlled using the
+           The position of the tab bar is controlled using the
            \l{#tab-bar-sub}{::tab-bar} subcontrol.
 
            By default, the subcontrols have positions of a QTabWidget in 
@@ -1254,7 +1254,7 @@
            the \l{#menu-button-sub}{::menu-button} subcontrol is used to draw the
            menu button. \l{#menu-arrow-sub}{::menu-arrow} subcontrol is used to
            draw the menu arrow inside the menu-button. By default, it is
-           positioned in the center of the Contents rectangle of the the
+           positioned in the center of the Contents rectangle of the
            menu-button subcontrol.
 
            When the QToolButton displays arrows, the \l{#up-arrow-sub}{::up-arrow},
@@ -1872,10 +1872,6 @@
 
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 54
 
-        \note If you specify more than one parameter in \c font-family,
-        e.g., \c{font-family: Verdana, Arial}, Qt will only use the first
-        font. If it cannot be found, Qt uses the system fallbacks instead.
-
     \row
         \o \c font-size
         \o \l{#Font Size}{Font Size}
diff --git a/doc/src/symbian-exceptionsafety.qdoc b/doc/src/symbian-exceptionsafety.qdoc
new file mode 100644
index 0000000..e42ecd1
--- /dev/null
+++ b/doc/src/symbian-exceptionsafety.qdoc
@@ -0,0 +1,183 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page symbianexceptionsafety.html
+    \title Exception Safety with Symbian
+    \ingroup qts60
+    \brief A guide to integrating exception safety in Qt with Symbian.
+
+    The following sections describe how Qt code can interoperate with Symbian's
+    exception safety system.
+
+    \tableofcontents
+
+    \section1 What the problem is
+    
+    Qt and Symbian have different exception systems. Qt works with standard C++ 
+    exceptions, whereas Symbian has its TRAP/Leave/CleanupStack system. So, what would 
+    happen if 
+    you mix the two systems? It could go wrong in a number of ways.
+
+    Cleanup ordering would be different between the two. When Symbian code 
+    leaves, the cleanup stack is cleaned up before anything else happens. After 
+    that, the objects on the call stack would be cleaned up as with a normal 
+    exception. So if there are any dependencies between stack based and cleanup stack 
+    owned objects, there could be problems due to this ordering. 
+
+    Symbian's \c XLeaveException, which is used when Symbian implements leaves as 
+    exceptions, is not derived from \c std::exception, so would not be caught in 
+    Qt catch statements designed to catch \c std::exception. 
+
+    Qt's and standard C++'s \c std::exception derived exceptions result in program 
+    termination if they fall back to a Symbian TRAP. 
+
+	These problems can be solved with barrier macros and helper functions that 
+	will translate between the two exception systems. Use them, in Qt code, 
+	whenever calling into or being called from Symbian code.
+
+    \section1 Qt calls to Symbian
+
+    When calling Symbian leaving functions from Qt code, we want to translate 
+    Symbian leaves to standard C++ exceptions. The following help is provided:
+
+    \list
+        \o \l qt_translateSymbianErrorToException() takes a Symbian
+        error code and throws an appropriate exception to represent it. 
+        This will do nothing if the error code is not in fact an error. The 
+        function is equivalent to Symbian's \c User::LeaveIfError.
+        \o \l QT_TRANSLATE_SYMBIAN_LEAVE_TO_EXCEPTION() takes a Symbian leaving
+        code fragment f and runs it under a trap harness converting any resulting 
+        error into an exception.
+        \o \c TRAP and \c TRAPD from the Symbian libraries can be used to convert 
+        leaves to error codes. 
+    \endlist
+
+    \code
+    HBufC* buf=0;
+    // this will throw a std::bad_alloc because we've asked for too much memory
+    QT_TRANSLATE_SYMBIAN_LEAVE_TO_EXCEPTION(buf = HBufC::NewL(100000000));
+
+    _LIT(KStr,"abc");
+    TInt pos = KStr().Locate('c');
+    // pos is a good value, >= 0, so no exception is thrown
+    qt_translateSymbianErrorToException(pos);
+    
+    pos = KStr().Locate('d');
+    // pos == KErrNotFound, so this throws an exception
+    qt_translateSymbianErrorToException(pos);
+    \endcode
+    
+    \section1 Qt called from Symbian
+
+    When Qt code is called from Symbian, we want to translate standard C++ 
+    exceptions to Symbian leaves or error codes. The following help is 
+    provided:
+
+    \list
+        \o \l qt_translateExceptionToSymbianError() -
+        this takes a standard exception and gives an appropriate Symbian 
+        error code. If no mapping is known for the exception type, 
+        \c KErrGeneral is returned.
+        \o \l qt_translateExceptionToSymbianErrorL() -
+        this takes a standard exception and generates an appropriate Symbian 
+        leave.
+        \o \l QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_ERROR() - this macro
+        takes the standard C++ code fragment \c f, catches any std::exceptions 
+        thrown from it, and sets err to the corresponding Symbian error code. 
+        err is set to \c KErrNone otherwise.
+        \o \l QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE() - this macro takes the
+        standard C++ code fragment \c f, catches any std::exceptions thrown from 
+        it, and throws a corresponding Symbian leave. 
+    \endlist
+    
+    \code
+    TInt DoTickL() // called from an active object RunL, ie Symbian leaves expected
+        {
+        // without the translation to Symbian Leave, we get a USER:0 panic
+        QT_TRANSLATE_EXCEPTION_TO_SYMBIAN_LEAVE({
+            int* x = new int[100000000];            // compiled as Qt code, will throw std::bad_alloc
+            delete [] x;
+        });
+        return 0;
+        }
+    \endcode
+
+    \section1 Common sense things
+
+    Try to minimise the interleaving of Symbian and Qt code, every switch 
+    requires a barrier. Grouping the code styles in different blocks will 
+    minimise the problems. For instance, examine the following code.
+
+    \code
+    1.    TRAPD(err, m_playUtility = CMdaAudioPlayerUtility::NewL(*this);
+    2.               QString filepath = QFileInfo( m_sound->fileName() ).absoluteFilePath();
+    3.               filepath = QDir::toNativeSeparators(filepath);
+    4.               m_playUtility->OpenFileL(qt_QString2TPtrC(filepath)));
+    \endcode
+
+    Line 1 starts a Symbian leave handling block, which is good because it 
+    also uses a Symbian leave generating function.
+
+    Line 2 creates a \l QString, uses \l QFileInfo and various member functions. 
+    These could all throw exceptions, which is not good inside a \c TRAP block.
+
+    Line 3 is unclear as to whether it might throw an exception, but since 
+    it's dealing with strings it probably does, again bad.
+
+    Line 4 is tricky, it calls a leaving function which is ok within a \c TRAP, 
+    but it also uses a helper function to convert string types. In this case
+    the helper function may cause an unwelcome exception.
+
+    We could rewrite this with nested exception translations, but it's much 
+    easier to refactor it. 
+
+    \code
+    QString filepath = QFileInfo( m_sound->fileName() ).absoluteFilePath();
+    filepath = QDir::toNativeSeparators(filepath);
+    TPtrC filepathPtr(qt_QString2TPtrC(filepath));
+    TRAPD(err, m_playUtility = CMdaAudioPlayerUtility::NewL(*this);
+               m_playUtility->OpenFileL(filepathPtr));
+    \endcode
+
+    Now the exception generating functions are separated from the leaving 
+    functions.
+*/
diff --git a/doc/src/tech-preview/known-issues.html b/doc/src/tech-preview/known-issues.html
index 05df69e..885104e 100644
--- a/doc/src/tech-preview/known-issues.html
+++ b/doc/src/tech-preview/known-issues.html
@@ -16,7 +16,7 @@
         <td align="right" valign="middle"></td></tr></table>
 <h1>Known Issues: Qt 4.0.0 Technology Preview 1</h1>
 <p>
-    This is the list of known and reported issues for the the Qt 4.0.0 
+    This is the list of known and reported issues for the Qt 4.0.0 
     Technology Preview 1. This list is updated daily.
 </p>
 <br><br>
diff --git a/doc/src/timers.qdoc b/doc/src/timers.qdoc
index 4f54343..1b48d7d 100644
--- a/doc/src/timers.qdoc
+++ b/doc/src/timers.qdoc
@@ -62,7 +62,7 @@
 
     In multithreaded applications, you can use the timer mechanism in
     any thread that has an event loop. To start an event loop from a
-    non-GUI thread, use QThread::exec(). Qt uses the the object's
+    non-GUI thread, use QThread::exec(). Qt uses the object's
     \l{QObject::thread()}{thread affinity} to determine which thread
     will deliver the QTimerEvent. Because of this, you must start and
     stop all timers in the object's thread; it is not possible to
@@ -105,7 +105,7 @@
 
     In multithreaded applications, you can use QTimer in any thread
     that has an event loop. To start an event loop from a non-GUI
-    thread, use QThread::exec(). Qt uses the the timer's
+    thread, use QThread::exec(). Qt uses the timer's
     \l{QObject::thread()}{thread affinity} to determine which thread
     will emit the \l{QTimer::}{timeout()} signal. Because of this, you
     must start and stop the timer in its thread; it is not possible to
diff --git a/doc/src/tools-list.qdoc b/doc/src/tools-list.qdoc
index 7af9936..caef268 100644
--- a/doc/src/tools-list.qdoc
+++ b/doc/src/tools-list.qdoc
@@ -58,12 +58,10 @@
          \o Translate applications to reach international markets.
     \row \o \l{qmake Manual}{qmake}
          \o Create makefiles from simple platform-independent project files (\c .pro files).
-    \omit
-    \row \o \l{emb-qvfb.html}{qvfb}
+    \row \o \l{The Virtual Framebuffer}{qvfb}
          \o Run and test embedded applications on the desktop.
-    \row \o \l{emb-makeqpf.html}{makeqpf}
+    \row \o \l{makeqpf}
          \o Create pre-rendered fonts for embedded devices.
-    \endomit
     \row \o \l{moc}{Meta-Object Compiler (moc)}
          \o Generate meta-object information for QObject subclasses.
     \row \o \l{User Interface Compiler (uic)}
diff --git a/doc/src/topics.qdoc b/doc/src/topics.qdoc
index 301f0d4..09a86bd 100644
--- a/doc/src/topics.qdoc
+++ b/doc/src/topics.qdoc
@@ -286,11 +286,9 @@ including ARM, Intel x86, MIPS and SH-4.
     \o \l {Qt for Windows CE Requirements}
     \o \l {Installing Qt on Windows CE}
     \o \l {Windows CE - Introduction to using Qt}{Introduction to using Qt}
-    \o \l {Qt Examples#Qt for Embedded Linux}{Examples}
 \endlist
 \o
 \list
-    \o \l {Qt for Embedded Linux Classes}{Classes}
     \o \l {Windows CE - Using shadow builds}{Using shadow builds}
     \o \l {Windows CE - Working with Custom SDKs}{Working with Custom SDKs}
 \endlist
@@ -302,3 +300,14 @@ including ARM, Intel x86, MIPS and SH-4.
 \endlist
 \endtable
 */
+
+/*!
+\group qts60
+\title Qt for S60
+\ingroup topics
+\brief Documents related to Qt for S60
+
+\list
+    \o \l {Exception Safety with Symbian}
+\endlist
+*/
diff --git a/doc/src/tutorials/addressbook.qdoc b/doc/src/tutorials/addressbook.qdoc
index 3b0d2bc..9a1af85 100644
--- a/doc/src/tutorials/addressbook.qdoc
+++ b/doc/src/tutorials/addressbook.qdoc
@@ -296,14 +296,14 @@
 
     We also declare two private QString objects, \c oldName and \c oldAddress.
     These objects are needed to hold the name and address of the contact that
-    was last displayed, before the user clicked "Add". So, when the user clicks
-    "Cancel", we can revert to displaying the details of the last contact.
+    was last displayed, before the user clicked \gui Add. So, when the user clicks
+    \gui Cancel, we can revert to displaying the details of the last contact.
 
     \section1 Implementing the AddressBook Class
 
     Within the constructor of \c AddressBook, we set the \c nameLine and
     \c addressText to read-only, so that we can only display but not edit
-    existing cotact details.
+    existing contact details.
 
     \dots
     \snippet tutorials/addressbook/part2/addressbook.cpp setting readonly 1
@@ -318,7 +318,7 @@
     The \c addButton is displayed by invoking the \l{QPushButton::show()}
     {show()} function, while the \c submitButton and \c cancelButton are
     hidden by invoking \l{QPushButton::hide()}{hide()}. These two push
-    buttons will only be displayed when the user clicks "Add" and this is
+    buttons will only be displayed when the user clicks \gui Add and this is
     handled by the \c addContact() function discussed below.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp connecting signals and slots
@@ -362,7 +362,7 @@
     \list 1
     \o We extract the contact's details from \c nameLine and \c addressText
     and store them in QString objects. We also validate to make sure that the
-    user did not click "Submit" with empty input fields; otherwise, a
+    user did not click \gui Submit with empty input fields; otherwise, a
     QMessageBox is displayed to remind the user for a name and address.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part1
@@ -374,8 +374,8 @@
     \snippet tutorials/addressbook/part2/addressbook.cpp submitContact part2
 
     If the contact already exists, again, we display a QMessageBox to inform
-    the user about this, to prevent the user from adding duplicate contacts.
-    Our \c contacts object is based on key-value pairs of name and addresses,
+    the user about this, preventing the user from adding duplicate contacts.
+    Our \c contacts object is based on key-value pairs of name and address,
     hence, we want to ensure that \e key is unique.
 
     \o Once we have handled both cases mentioned above, we restore the push
@@ -396,9 +396,9 @@
 
     \snippet tutorials/addressbook/part2/addressbook.cpp cancel
 
-    The general idea to add a contact is to give the user the flexibility to
-    click "Submit" or "Cancel" at any time. The flowchart below further
-    explains this concept:
+    The general idea behind adding a contact is to give the user the
+    flexibility to click \gui Submit or \gui Cancel at any time. The flowchart below
+    further explains this concept:
 
     \image addressbook-tutorial-part2-add-flowchart.png
 */
@@ -454,7 +454,7 @@
     \snippet tutorials/addressbook/part3/addressbook.cpp connecting navigation signals
 
     The image below is our expected graphical user interface. Notice that it
-    is getting closer to our expected final output.
+    is getting closer to our final application.
 
     \image addressbook-tutorial-part3-screenshot.png
 
@@ -510,7 +510,7 @@
     \list
         \o If the iterator is at the end of \c contacts, we clear the
         display and return.
-        \o If the iterator is the beginning of \c contacts, we move it to
+        \o If the iterator is at the beginning of \c contacts, we move it to
         the end.
         \o We then decrement the iterator by one.
     \endlist
@@ -529,7 +529,7 @@
     \example tutorials/addressbook/part4
     \title Address Book 4 - Editing and Removing Addresses
 
-    In this chapter, we look at ways to modify the contents of contact stored
+    In this chapter, we look at ways to modify the contents of contacts stored
     in the address book application.
 
     \image addressbook-tutorial-screenshot.png
@@ -539,7 +539,7 @@
     edit and remove functions so that a contact's details can be changed
     when needed. However, this requires a little improvement, in the form of
     enums. In our previous chapters, we had two modes: \c{AddingMode} and
-    \c{NavigationMode} - but they weren't defined as enums. Instead, we
+    \c{NavigationMode} - but they were not defined as enums. Instead, we
     enabled and disabled the corresponding buttons manually, resulting in
     multiple lines of repeated code.
 
@@ -573,8 +573,7 @@
     \dots
     \snippet tutorials/addressbook/part4/addressbook.h mode declaration
 
-    Lastly, we declare \c currentMode to keep track of the current mode of the
-    enum.
+    Lastly, we declare \c currentMode to keep track of the enum's current mode.
 
     \section1 Implementing the AddressBook Class
 
diff --git a/doc/src/xquery-introduction.qdoc b/doc/src/xquery-introduction.qdoc
index 37a45ac..fe541e2 100644
--- a/doc/src/xquery-introduction.qdoc
+++ b/doc/src/xquery-introduction.qdoc
@@ -347,7 +347,7 @@ has a more detailed section on the shorthand form, which it calls the
 \l{http://www.w3.org/TR/xquery/#abbrev} {abbreviated syntax}. More
 examples of path expressions written in the shorthand form are found
 there. There is also a section listing examples of path expressions
-written in the the \l{http://www.w3.org/TR/xquery/#unabbrev} {longhand
+written in the \l{http://www.w3.org/TR/xquery/#unabbrev} {longhand
 form}.
 
 \target Name Tests