Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

4 files changed, 13 insertions, 10 deletions

diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc
index 7e02f1a..d9f7c1a 100644
--- a/doc/src/deployment.qdoc
+++ b/doc/src/deployment.qdoc
@@ -91,7 +91,7 @@
     The disadvantage with the shared library approach is that you
     will get more files to deploy. For more information, see
     \l{sharedlibrary.html}{Creating Shared Libraries}.
-    
+
     \section1 Deploying Qt's Libraries
 
     \table
@@ -111,13 +111,14 @@
         \o \l {QtNetwork}
         \o \l {QtOpenGL}
         \o \l {QtScript}
-        \o \l {QtSql}
+        \o \l {QtScriptTools}
     \row
+        \o \l {QtSql}
         \o \l {QtSvg}
         \o \l {QtWebKit}
         \o \l {QtXml}
-        \o \l {QtXmlPatterns}
     \row
+        \o \l {QtXmlPatterns}
         \o \l {Phonon Module}{Phonon}
         \o \l {Qt3Support}
     \endtable
@@ -178,11 +179,13 @@
     Please see \l{QtWebKit Module#License Information}{the QtWebKit module
     documentation} for more information.
 
-    \row    \o Phonon     \o Phonon
+    \row    \o \l{Phonon Module}{Phonon}     \o Phonon
     \o Phonon relies on the native multimedia engines on different platforms.
     Phonon itself is licensed under the GNU LGPL version 2. Please see
     \l{Phonon Module#License Information}{the Phonon module documentation}
-    for more information.
+    for more information on licensing and the
+    \l{Phonon Overview#Backends}{Phonon Overview} for details of the backends
+    in use on different platforms.
     \endtable
 
     \section1 Platform-Specific Notes
diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc
index 147ded3..3d04c68 100644
--- a/doc/src/phonon-api.qdoc
+++ b/doc/src/phonon-api.qdoc
@@ -2568,7 +2568,7 @@
     details.
 
     Phonon also provides EffectWidget, which lets the user modify the
-    parameters of an effect an the fly, e.g., with comboboxes.
+    parameters of an effect an the fly; e.g., with combo boxes.
 
     \sa {Phonon Module}, EffectWidget
 */
diff --git a/doc/src/phonon.qdoc b/doc/src/phonon.qdoc
index fa84b96..9470e61 100644
--- a/doc/src/phonon.qdoc
+++ b/doc/src/phonon.qdoc
@@ -49,7 +49,7 @@
     \section1 Introduction
 
     Qt uses the Phonon multimedia framework to provide functionality
-    for playback of the most common multimedia formats.The media can
+    for playback of the most common multimedia formats. The media can
     be read from files or streamed over a network, using a QURL to a
     file.
 
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 6220795..e6a1a36 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -508,11 +508,11 @@
     \value DirectConnection  When emitted, the signal is immediately delivered to the slot.
     \value QueuedConnection  When emitted, the signal is queued until the event loop is
                              able to deliver it to the slot.
-    \value
-    BlockingQueuedConnection Same as QueuedConnection, except that the current thread blocks
+    \value BlockingQueuedConnection
+                             Same as QueuedConnection, except that the current thread blocks
                              until the slot has been delivered. This connection type should
                              only be used for receivers in a different thread. Note that misuse
-                             of this type can lead to dead locks in your application.
+                             of this type can lead to deadlocks in your application.
     \value AutoConnection    If the signal is emitted from the thread
                              in which the receiving object lives, the
                              slot is invoked directly, as with