Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits)
  Empty commit to trigger a rebuild in the CI system
  Use case-insensitive comparison for the "data" scheme in URLs
  tst_bic: Fix building on Mac 64
  Fix building of tst_QTcpSocket
  Autotest: some improvements to timeout testing of tst_QTcpSocket
  Revert "Optimized pixmapcache key generation for icons and styles"
  Revert "More improvements to pixmap cache key generation"
  More improvements to pixmap cache key generation
  More 4.7 stuff.
  Fix for autotest failure in qwidget::saveRestoreGeometry()
  Optimized pixmapcache key generation for icons and styles
  doc: Another upgrade of the top page and overviews.
  Mac: restoreGeometry()
  [Regression] Build failure on Mac Carbon
  doc: Added some \briefs to how-to docs.
  Some 4.7 changes.
  Updated changelog.
  Cherry pick fix for MOBILITY-932 from Qt Mobility.
  Cherry pick fix for MOBILITY-962 from Qt Mobility.
  Cherry pick fix for MOBILITY-828 from Qt Mobility.
  ...

22 files changed, 170 insertions, 158 deletions

diff --git a/doc/src/development/developing-on-mac.qdoc b/doc/src/development/developing-on-mac.qdoc
index 785858f..0c0af79 100644
--- a/doc/src/development/developing-on-mac.qdoc
+++ b/doc/src/development/developing-on-mac.qdoc
@@ -41,9 +41,8 @@
 
 /*!
     \page developing-on-mac.html
-    \title Developing Qt Applications on Mac OS X
-    \brief A overview of items to be aware of when developing Qt applications
-        on Mac OS X
+    \title Developing Qt Applications for Mac OS X
+    \brief Information for developing Qt applications for Mac OS X
     \ingroup platform-specific
 
     \tableofcontents
diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc
index 35f1c75..0aff214 100644
--- a/doc/src/frameworks-technologies/accessible.qdoc
+++ b/doc/src/frameworks-technologies/accessible.qdoc
@@ -47,7 +47,10 @@
 /*!
     \page accessible.html
     \title Accessibility
+    \brief How to make your applications accessible to those with disabilities.
+
     \ingroup technology-apis
+    \ingroup best-practices
 
     \tableofcontents
 
diff --git a/doc/src/frameworks-technologies/dbus-adaptors.qdoc b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
index 11c5998..3dd0e4d 100644
--- a/doc/src/frameworks-technologies/dbus-adaptors.qdoc
+++ b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
@@ -42,8 +42,9 @@
 /*!
     \page usingadaptors.html
     \title Using QtDBus Adaptors
-    \ingroup technology-apis
+    \brief How to create and use DBus adaptors in Qt.
 
+    \ingroup technology-apis
     \ingroup best-practices
 
     Adaptors are special classes that are attached to any QObject-derived class
diff --git a/doc/src/frameworks-technologies/phonon.qdoc b/doc/src/frameworks-technologies/phonon.qdoc
index 61d7926..61b906e 100644
--- a/doc/src/frameworks-technologies/phonon.qdoc
+++ b/doc/src/frameworks-technologies/phonon.qdoc
@@ -42,7 +42,9 @@
 /*!
     \page phonon-overview.html
     \title Phonon multimedia framework
+    \brief Using the Phonon multimedia framework in Qt.
     \ingroup technology-apis
+    \ingroup best-practices
 
     \tableofcontents
 
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index b73e15d..cedebf9 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -41,15 +41,15 @@
 
 /*!
     \page known-issues.html
-    \title Known Issues in %VERSION%
+    \title Known Issues in this Qt Version
     \ingroup platform-specific
-    \brief A summary of known issues in Qt %VERSION% at the time of release.
+    \brief A summary of known issues in this Qt version at the time of release.
 
-    An up-to-date list of known issues with Qt %VERSION% can be found via the
+    An up-to-date list of known issues can be found at
     \l{http://bugreports.qt.nokia.com/}{Qt Bug Tracker}.
 
-    For a list list of known bugs in Qt %VERSION%, see the \l{Task Tracker}
-    on the Qt website.
+    For a list list of known bugs, see the \l{Task Tracker} at the Qt
+    website.
 
     An overview of known issues may also be found at:
     \l{http://qt.gitorious.org/qt/pages/QtKnownIssues}
diff --git a/doc/src/howtos/HWacceleration.qdoc b/doc/src/howtos/HWacceleration.qdoc
index fbc657c..c7b1a72 100644
--- a/doc/src/howtos/HWacceleration.qdoc
+++ b/doc/src/howtos/HWacceleration.qdoc
@@ -41,17 +41,20 @@
 
 /*!
     \page HWAcc_rendering.html
-    \title Using hardware acceleration on embedded platforms.
+    \title Hardware Acceleration &amp Embedded Platforms.
+    \brief How to use hardware acceleration for fast rendering.
 
     \ingroup best-practices
 
     \section1 Abstract
+
     This document describes how to use hardware acceleration for fast
-    rendering on embedded platforms supported by Qt. In short, it explains
-    how the graphics pipeline works. Since there might be differences to 
-	how the APIs are being used on different embedded platforms, a table
-	links to documentation dedicated to platform specific documentation
-	for each supported hardware acceleration API.
+    rendering on embedded platforms supported by Qt. In short, it
+    explains how the graphics pipeline works. Since there might be
+    differences to how the APIs are being used on different embedded
+    platforms, a table links to documentation dedicated to platform
+    specific documentation for each supported hardware acceleration
+    API.
 
     \input platforms/emb-hardwareacceleration.qdocinc
 
diff --git a/doc/src/howtos/accelerators.qdoc b/doc/src/howtos/accelerators.qdoc
index 65f1def..b6ef5c2 100644
--- a/doc/src/howtos/accelerators.qdoc
+++ b/doc/src/howtos/accelerators.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page accelerators.html
     \title Standard Accelerator Keys
+    \brief Recommended accelerator keys.
 
     \ingroup best-practices
 
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index dd39509..9377961 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page appicon.html
     \title Setting the Application Icon
+    \brief How to set your application's icon.
 
     \ingroup best-practices
 
diff --git a/doc/src/howtos/guibooks.qdoc b/doc/src/howtos/guibooks.qdoc
index 1a70670..bccfbe6 100644
--- a/doc/src/howtos/guibooks.qdoc
+++ b/doc/src/howtos/guibooks.qdoc
@@ -43,6 +43,7 @@
     \page guibooks.html
     \title Books about GUI Design
     \ingroup best-practices
+    \brief Some recommended books about GUI design.
 
     This is not a comprehensive list -- there are many other books worth
     buying. Here we mention just a few user interface books that don't
diff --git a/doc/src/howtos/qtdesigner.qdoc b/doc/src/howtos/qtdesigner.qdoc
index 2dd7fcf..92041f0 100644
--- a/doc/src/howtos/qtdesigner.qdoc
+++ b/doc/src/howtos/qtdesigner.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page qtdesigner-components.html
     \title Creating and Using Components for Qt Designer
+    \brief How to create and use custom widget plugins.
     \ingroup best-practices
 
     \tableofcontents
diff --git a/doc/src/howtos/restoring-geometry.qdoc b/doc/src/howtos/restoring-geometry.qdoc
index 36c5e4f..e72b993 100644
--- a/doc/src/howtos/restoring-geometry.qdoc
+++ b/doc/src/howtos/restoring-geometry.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page restoring-geometry.html
     \title Restoring a Window's Geometry
-
+    \brief How to save &amp restore window geometry.
     \ingroup best-practices
 
     This document describes how to save and restore a \l{Window
diff --git a/doc/src/howtos/session.qdoc b/doc/src/howtos/session.qdoc
index e2e87a8..f53af04 100644
--- a/doc/src/howtos/session.qdoc
+++ b/doc/src/howtos/session.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page session.html
     \title Session Management
-
+    \brief How to do session management with Qt.
     \ingroup best-practices
 
     A \e session is a group of running applications, each of which has a
diff --git a/doc/src/howtos/sharedlibrary.qdoc b/doc/src/howtos/sharedlibrary.qdoc
index 70fc4db..ed803ed 100644
--- a/doc/src/howtos/sharedlibrary.qdoc
+++ b/doc/src/howtos/sharedlibrary.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page sharedlibrary.html
     \title Creating Shared Libraries
-
+    \brief How to create shared libraries.
     \ingroup best-practices
 
     The following sections list certain things that should be taken into
diff --git a/doc/src/howtos/timers.qdoc b/doc/src/howtos/timers.qdoc
index cfc2fb4..b001916 100644
--- a/doc/src/howtos/timers.qdoc
+++ b/doc/src/howtos/timers.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page timers.html
     \title Timers
-    \brief How to use timers in your application.
+    \brief How to use Qt timers in your application.
 
     \ingroup best-practices
 
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 0b82388..c3c59af 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -117,13 +117,28 @@
 */
 
 /*!
+  \group qt-sql
+  \title Using SQL in Qt
+  \brief Qt API's for using SQL.
+  \ingroup technology-apis
+  \ingroup best-practices
+
+  These pages document Qt's API's for using SQL database systems
+  in Qt applications.
+
+  \generatelist{related}
+*/
+
+/*!
     \group best-practices
     \title How-To's and Best Practices
 
     \brief How-To Guides and Best Practices
 
-    These documents provide guidelines and best practices explaining
-    how to use Qt to solve specific technical problems.
+    These documents provide guidelines and best practices for using Qt
+    to solve specific technical problems. They are listed
+    alphabetically by the first word in the title, so scan the entire
+    list to find what you want.
 
     \generatelist{related}
 */
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 8f5b6a5..16e0c0f 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -517,7 +517,7 @@
 
     Note that some modules rely on other modules. If your application uses
     QtXmlPatterns, QtWebkit or QtScript it may still require \c NetworkServices
-    \o as these modules rely on QtNetwork to go online.
+    as these modules rely on QtNetwork to go online.
 
     For more information see the documentation of the individual Qt classes. If
     a class does not mention Symbian capabilities, it requires none.
diff --git a/doc/src/sql-programming/qsqldatatype-table.qdoc b/doc/src/sql-programming/qsqldatatype-table.qdoc
index fc961f5..fb5fb49 100644
--- a/doc/src/sql-programming/qsqldatatype-table.qdoc
+++ b/doc/src/sql-programming/qsqldatatype-table.qdoc
@@ -41,19 +41,20 @@
 
 /*!
   \page sql-types.html
-  \title Recommended Use of Data Types in Databases
+  \title Data Types for Qt-supported Database Systems
+  \brief Recommended data types for database systems
   
-  \ingroup best-practices
+  \ingroup qt-sql
 
-  \section1 Recommended Use of Types in Qt Supported Databases
+  \section1 Data Types for Qt Supported Database Systems
 
-  This table shows the recommended data types used when extracting data 
-  from the databases supported in Qt. It is important to note that the
-  types used in Qt are not necessarily valid as input to the specific
-  database. One example could be that a double would work perfectly as
-  input for floating point records in a database, but not necessarily
-  as a storage format for output from the database since it would be stored
-  with 64-bit precision in C++.
+  This table shows the recommended data types for extracting data from
+  the databases supported in Qt. Note that types used in Qt are not
+  necessarily valid as input types to a specific database
+  system. e.g., A double might work perfectly as input for floating
+  point records in a particular database, but not necessarily as a
+  storage format for output from that database, because it would be
+  stored with 64-bit precision in C++.
 
   \tableofcontents
 
diff --git a/doc/src/sql-programming/sql-driver.qdoc b/doc/src/sql-programming/sql-driver.qdoc
index 6bccd83..f0e4e52 100644
--- a/doc/src/sql-programming/sql-driver.qdoc
+++ b/doc/src/sql-programming/sql-driver.qdoc
@@ -44,7 +44,7 @@
     \title SQL Database Drivers
     \brief How to configure and install QtSql drivers for supported databases.
 
-    \ingroup best-practices
+    \ingroup qt-sql
 
     The QtSql module uses driver \l{How to Create Qt
     Plugins}{plugins} to communicate with the different database
diff --git a/doc/src/sql-programming/sql-programming.qdoc b/doc/src/sql-programming/sql-programming.qdoc
index f1f3e5e..b34810c 100644
--- a/doc/src/sql-programming/sql-programming.qdoc
+++ b/doc/src/sql-programming/sql-programming.qdoc
@@ -49,6 +49,7 @@
 /*!
     \page sql-programming.html
     \title SQL Programming
+    \ingroup qt-sql
     \nextpage Connecting to Databases
 
     \brief Database integration for Qt applications.
@@ -118,6 +119,7 @@
 /*!
     \page sql-connecting.html
     \title Connecting to Databases
+    \ingroup qt-sql
 
     \contentspage SQL Programming
     \previouspage SQL Programming
@@ -187,6 +189,7 @@
 /*!
     \page sql-sqlstatements.html
     \title Executing SQL Statements
+    \ingroup qt-sql
     
     \previouspage Connecting to Databases
     \contentspage SQL Programming
@@ -337,6 +340,7 @@
 /*!
     \page sql-model.html
     \title Using the SQL Model Classes
+    \ingroup qt-sql
     
     \previouspage Executing SQL Statements
     \contentspage SQL Programming
@@ -483,6 +487,7 @@
 /*!
     \page sql-presenting.html
     \title Presenting Data in a Table View
+    \ingroup qt-sql
     
     \previouspage Using the SQL Model Classes
     \contentspage SQL Programming
@@ -587,6 +592,7 @@
 /*!
     \page sql-forms.html
     \title Creating Data-Aware Forms
+    \ingroup qt-sql
     
     \previouspage Presenting Data in a Table View
     \contentspage SQL Programming
diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc
index b4bec8c..31dfe40 100644
--- a/doc/src/widgets-and-layouts/styles.qdoc
+++ b/doc/src/widgets-and-layouts/styles.qdoc
@@ -47,15 +47,9 @@
 
 /*!
     \page style-reference.html
-    \title Implementing Styles and Style Aware Widgets
+    \title Styles and Style Aware Widgets
     \ingroup qt-gui-concepts
-    \brief An overview of styles and the styling of widgets.
-
-    \ingroup frameworks-technologies
-
-    \previouspage Widget Classes
-    \contentspage Widgets and Layouts
-    \nextpage {Qt Style Sheets}{Style sheets}
+    \brief Styles and the styling of widgets.
 
     Styles (classes that inherit QStyle) draw on behalf of widgets
     and encapsulate the look and feel of a GUI. The QStyle class is
@@ -91,8 +85,6 @@
     current style. This document shows how widgets draw themselves
     and which possibilities the style gives them.
 
-    \tableofcontents
-
     \section1 Classes for Widget Styling
 
     These classes are used to customize an application's appearance and
diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc
index ac0bf77..9fe2d69 100644
--- a/doc/src/widgets-and-layouts/widgets.qdoc
+++ b/doc/src/widgets-and-layouts/widgets.qdoc
@@ -40,131 +40,121 @@
 ****************************************************************************/
 
 /*!
-    \page widgets-and-layouts.html
-    \title Widgets and Layouts
-    \ingroup qt-gui-concepts
-
-    \ingroup frameworks-technologies
-
-    \nextpage Widget Classes
-
-    The primary elements for designing user interfaces in Qt are widgets and layouts.
-    
-    \section1 Widgets
-
-    \l{Widget Classes}{Widgets} can display data and status information, receive
-    user input, and provide a container for other widgets that should be grouped
-    together. A widget that is not embedded in a parent widget is called a
-    \l{Application Windows and Dialogs}{window}.
-
-    \image parent-child-widgets.png A parent widget containing various child widgets.
-
-    The QWidget class provides the basic capability to render to the screen, and to
-    handle user input events. All UI elements that Qt provides are either subclasses
-    of QWidget, or are used in connection with a QWidget subclass. Creating custom
-    widgets is done by subclassing QWidget or a suitable subclass and reimplementing
-    the virtual event handlers.
-
-    \section1 Layouts
-
-    \l{Layout Management}{Layouts} are an elegant and flexible way to automatically
-    arrange child widgets within their container. Each widget reports its size requirements
-    to the layout through the \l{QWidget::}{sizeHint} and \l{QWidget::}{sizePolicy}
-    properties, and the layout distributes the available space accordingly.
-
-    \table
-    \row    
-    \o \image qgridlayout-with-5-children.png
-    \o \image qformlayout-with-6-children.png
-    \endtable
-
-    \l{Qt Designer Manual}{\QD} is a powerful tool for interactively creating and
-    arranging widgets in layouts.
-
-    \section1 Widget Styles
-
-    \l{Implementing Styles and Style Aware Widgets}{Styles} draw on behalf of widgets
-    and encapsulate the look and feel of a GUI. Qt's built-in widgets use the QStyle
-    class to perform nearly all of their drawing, ensuring that they look exactly like
-    the equivalent native widgets.
+  \page widgets-and-layouts.html
+  \title Widgets and Layouts
+  \ingroup qt-gui-concepts
+  \brief The primary elements for designing user interfaces in Qt.
+
+  \section1 Widgets
+
+  Widgets are the primary elements for creating user interfaces in Qt.
+  \l{Widget Classes}{Widgets} can display data and status information,
+  receive user input, and provide a container for other widgets that
+  should be grouped together. A widget that is not embedded in a
+  parent widget is called a \l{Application Windows and
+  Dialogs}{window}.
+
+  \image parent-child-widgets.png A parent widget containing various child widgets.
+
+  The QWidget class provides the basic capability to render to the
+  screen, and to handle user input events. All UI elements that Qt
+  provides are either subclasses of QWidget, or are used in connection
+  with a QWidget subclass. Creating custom widgets is done by
+  subclassing QWidget or a suitable subclass and reimplementing the
+  virtual event handlers.
+
+  \section1 Layouts
+
+  \l{Layout Management}{Layouts} are an elegant and flexible way to
+  automatically arrange child widgets within their container. Each
+  widget reports its size requirements to the layout through the
+  \l{QWidget::}{sizeHint} and \l{QWidget::}{sizePolicy} properties,
+  and the layout distributes the available space accordingly.
+
+  \table
+  \row    
+  \o \image qgridlayout-with-5-children.png
+  \o \image qformlayout-with-6-children.png
+  \endtable
+
+  \l{Qt Designer Manual}{\QD} is a powerful tool for interactively creating and
+  arranging widgets in layouts.
+
+  \section1 Widget Styles
+
+  \l{Implementing Styles and Style Aware Widgets}{Styles} draw on
+  behalf of widgets and encapsulate the look and feel of a GUI. Qt's
+  built-in widgets use the QStyle class to perform nearly all of their
+  drawing, ensuring that they look exactly like the equivalent native
+  widgets.
     
-    \table
-    \row
-    \o \image windowsxp-tabwidget.png
-    \o \image plastique-tabwidget.png
-    \o \image macintosh-tabwidget.png
-    \endtable
-
-    \l{Qt Style Sheets} are a powerful mechanism that allows you to customize the
-    appearance of widgets, in addition to what is already possible by subclassing QStyle.
-*/
-
-/*!
-    \page widget-classes.html
-    \title Widget Classes
+  \table
+  \row
+  \o \image windowsxp-tabwidget.png
+  \o \image plastique-tabwidget.png
+  \o \image macintosh-tabwidget.png
+  \endtable
 
-    \contentspage Widgets and Layouts
-    \nextpage Layout Management
+  \l{Qt Style Sheets} are a powerful mechanism that allows you to customize the
+  appearance of widgets, in addition to what is already possible by subclassing QStyle.
 
-    Below you find a list of all widget classes in Qt. You can also browse the
-    widget classes Qt provides in the various supported styles in the
-    \l{Qt Widget Gallery}.
+  \section1 The Widget Classes
 
-    \tableofcontents
+  The following sections list the widget classes. See the \l{Qt Widget
+  Gallery} for some examples.
 
-    \section1 Basic Widgets
+  \section2 Basic Widgets
 
-    These basic widgets (controls), such as buttons, comboboxes and scroll bars, are
-    designed for direct use.
+  These basic widgets (controls), e.g. buttons, comboboxes and
+  scroll bars, are designed for direct use.
 
-    \table
-    \row
-    \o \image windows-label.png
-    \o \image windowsvista-pushbutton.png
-    \o \image gtk-progressbar.png
-    \row
-    \o \image plastique-combobox.png
-    \o \image macintosh-radiobutton.png
-    \o \image cde-lineedit.png
-    \endtable
+  \table
+  \row
+  \o \image windows-label.png
+  \o \image windowsvista-pushbutton.png
+  \o \image gtk-progressbar.png
+  \row
+  \o \image plastique-combobox.png
+  \o \image macintosh-radiobutton.png
+  \o \image cde-lineedit.png
+  \endtable
 
-    \annotatedlist basicwidgets
+  \annotatedlist basicwidgets
 
-    \section1 Advanced Widgets
+  \section2 Advanced Widgets
 
-    Advanced GUI widgets such as tab widgets and progress bars provide more
-    complex user interface controls.
+  Advanced GUI widgets, e.g. tab widgets and progress bars, provide
+  more complex user interface controls.
 
-    \table
-    \row
-    \o \image windowsxp-treeview.png
-    \o \image gtk-calendarwidget.png
-    \o \image qundoview.png
-    \endtable
+  \table
+  \row
+  \o \image windowsxp-treeview.png
+  \o \image gtk-calendarwidget.png
+  \o \image qundoview.png
+  \endtable
 
-    \annotatedlist advanced
+  \annotatedlist advanced
 
-    \table
-    \row
-    \o \image windowsvista-tabwidget.png 
-    \o \image macintosh-groupbox.png
-    \endtable
+  \table
+  \row
+  \o \image windowsvista-tabwidget.png 
+  \o \image macintosh-groupbox.png
+  \endtable
 
-    \section1 Organizer Widgets
+  \section2 Organizer Widgets
 
-    Classes like splitters, tab bars, button groups, etc are used to
-    organize and group GUI primitives into more complex applications or
-    dialogs.
+  Classes like splitters, tab bars, button groups, etc are used for
+  organizing and grouping GUI primitives into more complex
+  applications and dialogs.
 
-    \annotatedlist organizers
+  \annotatedlist organizers
 
-    \section1 Abstract Widget Classes
+  \section2 Abstract Widget Classes
 
-    Abstract widget classes usable through subclassing. They are generally
-    not usable in themselves, but provide functionality that can be used
-    by inheriting these classes.
+  The abstract widget classes are base classes. They are not usable as
+  standalone classes but provide functionality when they are subclassed.
 
-    \annotatedlist abstractwidgets
+  \annotatedlist abstractwidgets
 */
 
 /*!
diff --git a/doc/src/windows-and-dialogs/mainwindow.qdoc b/doc/src/windows-and-dialogs/mainwindow.qdoc
index b282dab..c1e66d9 100644
--- a/doc/src/windows-and-dialogs/mainwindow.qdoc
+++ b/doc/src/windows-and-dialogs/mainwindow.qdoc
@@ -46,12 +46,11 @@
 
 /*!
     \page application-windows.html
-    \title Application Windows and Dialogs
+    \title Window and Dialog Widgets
+    \brief Windows and Dialogs in Qt.
     \ingroup qt-gui-concepts
     \ingroup frameworks-technologies
 
-    \nextpage The Application Main Window
-
     A \l{Widgets Tutorial}{widget} that is not embedded in a parent widget is called a window.
     Usually, windows have a frame and a title bar, although it is also possible to create
     windows without such decoration using suitable window flags). In Qt, QMainWindow
@@ -165,12 +164,9 @@
 
 /*!
     \page mainwindow.html
-    \title The Application Main Window
-    \brief Everything you need for a typical modern main application window,
-    including menus, toolbars, workspace, etc.
-
-    \contentspage Application Windows and Dialogs
-    \nextpage Dialog Windows
+    \title Application Main Window
+    \ingroup qt-gui-concepts
+    \brief Creating the application window.
 
     \tableofcontents