doc: Changed some titles so lists of contents sort better.

9 files changed, 13 insertions, 12 deletions

diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 4573f3c..020ca16 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -155,7 +155,7 @@
     \row    \o QtWebKit   \o WebKit
     \o WebKit is licensed under the GNU LGPL version 2 or later.
     This has implications for developers of closed source applications.
-    Please see \l{QtWebKit Module#License Information}{the QtWebKit module
+    Please see \l{WebKit in Qt#License Information}{the QtWebKit module
     documentation} for more information.
 
     \row    \o \l{Phonon Module}{Phonon}     \o Phonon
diff --git a/doc/src/development/developing-with-qt.qdoc b/doc/src/development/developing-with-qt.qdoc
index f9b38b8..b88fe3f 100644
--- a/doc/src/development/developing-with-qt.qdoc
+++ b/doc/src/development/developing-with-qt.qdoc
@@ -83,7 +83,7 @@
         \o \l {Known Issues}
         \o \l {Platform Notes}
         \o \l {Platform Notes - Symbian}
-        \o \l {Qt For ActiveX}
+        \o \l {ActiveX in Qt}
         \o \l {Qt for Embedded Linux Classes}
         \o \l {Qt for Embedded Platforms}
         \o \l {Qt for Mac OS X - Specific Issues}
diff --git a/doc/src/frameworks-technologies/containers.qdoc b/doc/src/frameworks-technologies/containers.qdoc
index 58061ad..797326e 100644
--- a/doc/src/frameworks-technologies/containers.qdoc
+++ b/doc/src/frameworks-technologies/containers.qdoc
@@ -43,7 +43,7 @@
 
 /*!
     \page containers.html
-    \title Generic Containers
+    \title Container Classes
     \ingroup technology-apis
     \ingroup groups
     \keyword container class
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 131f063..7167f97 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -1011,7 +1011,7 @@
 
     \snippet doc/src/snippets/reading-selections/window.cpp 0
 
-    The above code uses Qt's convenient \l{Generic Containers}{foreach
+    The above code uses Qt's convenient \l{Container Classes}{foreach
     keyword} to iterate over, and modify, the items corresponding to the
     indexes returned by the selection model.
 
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index ef16224..94b19c3 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -134,7 +134,7 @@
     \section1 QtWebKit
 
     \list
-    \o \l{Web Browser} demonstrates how Qt's \l{QtWebKit Module}{WebKit module}
+    \o \l{Web Browser} demonstrates how Qt's \l{WebKit in Qt}{WebKit module}
         can be used to implement a small Web browser.
     \endlist
 
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 3c02705..caf9404 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -91,11 +91,12 @@
 
 /*!
   \group qt-activex
-  \title Qt For ActiveX
-  \brief Qt API's for using ActiveX controls, servers, and COM.
+  \title ActiveX in Qt
   \ingroup technology-apis
   \ingroup platform-specific
 
+  \brief Qt API's for using ActiveX controls, servers, and COM.
+
   These pages document Qt's API's for developing with ActiveX
   controls, servers, and COM.
 
@@ -104,7 +105,7 @@
 
 /*!
   \group qt-sql
-  \title Using SQL in Qt
+  \title SQL in Qt
   \brief Qt API's for using SQL.
   \ingroup technology-apis
   \ingroup best-practices
diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc
index 0bbf35f..7b80e13 100644
--- a/doc/src/porting/porting4.qdoc
+++ b/doc/src/porting/porting4.qdoc
@@ -2598,7 +2598,7 @@
     seems feeble.
     \endomit
 
-    See \l{Generic Containers} for a list of Qt 4 containers.
+    See \l{Container Classes} for a list of Qt 4 containers.
 
     \section1 QPtrDict<T>
 
@@ -3939,7 +3939,7 @@
        check the index against QVector::size() yourself.
     \endlist
 
-    See \l{Generic Containers} for an overview of the Qt 4 container
+    See \l{Container Classes} for an overview of the Qt 4 container
     classes.
 
     \section1 QVariant
diff --git a/doc/src/porting/qt4-tulip.qdoc b/doc/src/porting/qt4-tulip.qdoc
index 08542a6..333af84 100644
--- a/doc/src/porting/qt4-tulip.qdoc
+++ b/doc/src/porting/qt4-tulip.qdoc
@@ -97,7 +97,7 @@
     you are iterating, that won't affect the loop.
 
     For details about the new containers, see the
-    \l{Generic Containers} and \l{Generic Algorithms} overview documents.
+    \l{Container Classes} and \l{Generic Algorithms} overview documents.
 
     In addition to the new containers, considerable work has also gone into
     QByteArray and QString. The Qt 3 QCString class has been
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 8867fd9..88ef2a8 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -86,7 +86,7 @@
 
     In Qt 4.4:
     \list
-    \o \l{QtWebkit Module}{Qt WebKit integration}, making it possible for developers
+    \o \l{Webkit in QT}{Qt WebKit integration}, making it possible for developers
     to use a fully-featured Web browser to display documents and access online
     services.
     \o A multimedia API provided by the \l{Phonon Overview}{Phonon Multimedia Framework}.