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: (26 commits)
  Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression
  add performance comparisons to qregexp benchmark
  configure: fix error message when calling config.status
  Fix invalid memory write during recursive timer activation
  Added comment about calendarPopup in setCalendarWidget function documentation.
  doc: Fixed some qdoc errors.
  Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.
  CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.
  XmlListModel doc fixes
  Mention QML_IMPORT_TRACE in Modules docs
  Merge sections about when property and default state
  Explain Flipable example further
  PathView required some diagonal movement before a drag was initiated.
  doc: Fixed some qdoc errors.
  doc: Fixed some qdoc errors.
  OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0.
  doc: Fixed some qdoc errors.
  Add Ukrainian translation.
  doc: Fixed some qdoc errors.
  doc: Fixed some qdoc errors.
  ...

19 files changed, 57 insertions, 116 deletions

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 1fc9d69..b25d000 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -43,7 +43,7 @@ C++ module, you can load and interact with QML files from your Qt application.
 
 QML provides mechanisms to declaratively build an object tree using
 \l {QML Elements}{QML elements}. QML improves the integration between 
-{http://www.ecma-international.org/publications/standards/Ecma-262.htm}{JavaScript}
+\l {http://www.ecma-international.org/publications/standards/Ecma-262.htm}{JavaScript}
 and Qt's existing QObject based type
 system, adds support for automatic \l {Property Binding}{property
 bindings} and provides \l {Network Transparency}{network transparency}
diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc
index f056892..1a40f14 100644
--- a/doc/src/declarative/example-slideswitch.qdoc
+++ b/doc/src/declarative/example-slideswitch.qdoc
@@ -115,7 +115,7 @@ For more information on scripts see \l{Integrating JavaScript}.
 At this point, when the switch toggles between the two states the knob will instantly change its \c x position between 1 and 78.
 In order for the the knob to move smoothly we add a transition that will animate the \c x property with an easing curve for a duration of 200ms.
 
-For more information on transitions see \l{state-transitions}{QML Transitions}.
+For more information on transitions see \l{qdeclarativeanimation.html#transitions}{QML Transitions}.
 
 \section1 Usage
 The switch can be used in a QML file, like this:
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 8d3aa25..0d191c9 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -562,7 +562,7 @@
     \example declarative/ui-components/dialcontrol
 
     This example shows how to create a dial-type control. It combines
-    \l Image elements with \l Rotation transforms and \l SpringAnimatino behaviors
+    \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors
     to produce an interactive speedometer-type dial.
 
     \image qml-dialcontrol-example.png
diff --git a/doc/src/examples/simpletreemodel.qdoc b/doc/src/examples/simpletreemodel.qdoc
index c34f4af..16cf8b7 100644
--- a/doc/src/examples/simpletreemodel.qdoc
+++ b/doc/src/examples/simpletreemodel.qdoc
@@ -36,13 +36,15 @@
 
     \image simpletreemodel-example.png
 
-    Qt's model/view architecture provides a standard way for views to manipulate
-    information in a data source, using an abstract model of the data to
-    simplify and standardize the way it is accessed. Simple models represent
-    data as a table of items, and allow views to access this data via an
-    \l{model-view-model.html}{index-based} system. More generally, models can
-    be used to represent data in the form of a tree structure by allowing each
-    item to act as a parent to a table of child items.
+    Qt's model/view architecture provides a standard way for views to
+    manipulate information in a data source, using an abstract model
+    of the data to simplify and standardize the way it is accessed.
+    Simple models represent data as a table of items, and allow views
+    to access this data via an
+    \l{model-view-programming.html#model-indexes} {index-based}
+    system. More generally, models can be used to represent data in
+    the form of a tree structure by allowing each item to act as a
+    parent to a table of child items.
 
     Before attempting to implement a tree model, it is worth considering whether
     the data is supplied by an external source, or whether it is going to be
diff --git a/doc/src/examples/spinboxdelegate.qdoc b/doc/src/examples/spinboxdelegate.qdoc
index 49e3295..da65831 100644
--- a/doc/src/examples/spinboxdelegate.qdoc
+++ b/doc/src/examples/spinboxdelegate.qdoc
@@ -42,8 +42,9 @@
     \image spinboxdelegate-example.png
 
     This concepts behind this example are covered in the
-    \l{model-view-delegate.html}{Delegate Classes} chapter of the
-    \l{model-view-programming.html}{Model/View Programming} overview.
+    \l{model-view-programming.html#delegate-classes}{Delegate Classes}
+    chapter of the \l{model-view-programming.html}{Model/View
+    Programming} overview.
 
     \section1 SpinBoxDelegate Class Definition
 
diff --git a/doc/src/frameworks-technologies/dnd.qdoc b/doc/src/frameworks-technologies/dnd.qdoc
index c5dd27c..ebfa39e 100644
--- a/doc/src/frameworks-technologies/dnd.qdoc
+++ b/doc/src/frameworks-technologies/dnd.qdoc
@@ -30,7 +30,6 @@
     \title Drag and Drop
     \brief An overview of the drag and drop system provided by Qt.
 
-    \ingroup technology-apis
     \ingroup qt-gui-concepts
 
     Drag and drop provides a simple visual mechanism which users can use
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 93f6f88..6c85776 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -308,7 +308,7 @@
 	with a header that displays a row of menu names. The list of menus are declared
 	inside a \c VisualItemModel. The \l{VisualItemModel}{\c VisualItemModel}
 	element contains items that already have views such as \c Rectangle elements
-	and imported UI elements. Other model types such as the \l {ListModel}{\c ListModel}
+	and imported UI elements. Other model types such as the \l {ListModel}{\c ListModel}
 	element need a delegate to display their data.
 
 	We declare two visual items in the \c menuListModel, the \c FileMenu and the
@@ -361,7 +361,7 @@
 		}
 	\endcode
 
-	Additionally, \c ListView inherits from \l {Flickable}{\c Flickable}, making
+	Additionally, \c ListView inherits from \l {Flickable}{\c Flickable}, making
 	the list respond to mouse drags and other gestures. The last portion of the
 	code above sets \c Flickable properties to create the desired flicking movement
 	to our view. In particular,the property \c highlightMoveDuration changes the
@@ -585,7 +585,7 @@
 	that the targets' properties will animate for a certain duration of time and using
 	a certain easing curve. An easing curve controls the animation rates and
 	interpolation behavior during state transitions. The easing curve we chose is
-	\l {PropertyAnimation::easing.type}{Easing.OutQuint}, which slows the movement near
+	\l{PropertyAnimation::easing.type}{Easing.OutQuint}, which slows the movement near
 	the end of the animation. Pleae read \l {qdeclarativeanimation.html}{QML's Animation}
 	article.
 
@@ -737,7 +737,12 @@
 		};
 		
 	\endcode
-		Our plugin class, \c DialogPlugin is a subclass of \l {QDeclarativeExtensionPlugin}{QDeclarativeExtensionPlugin}. We need to implement the inherited function, \l {QDeclarativeExtensionPlugin::registerTypes}{registerTypes}. The \c dialogPlugin.cpp file looks like this:
+
+		Our plugin class, \c DialogPlugin is a subclass of \l
+		{QDeclarativeExtensionPlugin}{QDeclarativeExtensionPlugin}. We
+		need to implement the inherited function, \l
+		{QDeclarativeExtensionPlugin::registerTypes()}{registerTypes}. The
+		\c dialogPlugin.cpp file looks like this:
 		
 	\code
 	DialogPlugin.cpp:
@@ -756,7 +761,7 @@
 		Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin);
 	\endcode
 		
-	The \l {QDeclarativeExtensionPlugin::registerTypes}{registerTypes}
+	The \l {QDeclarativeExtensionPlugin::registerTypes()}{registerTypes}
 	function registers our File and Directory classes into QML. This function
 	needs the class name for its template, a major version number, a minor version
 	number, and a name for our classes.
@@ -816,7 +821,7 @@
 
 	The \c files list property is a list of all the filtered files in a directory.
 	The \c Directory class is implemented to filter out invalid text files; only
-	files with a \c .txt extension are valid. Further, \l {QLists}{QLists} can be
+	files with a \c .txt extension are valid. Further, \l {QList}{QLists} can be
 	used in QML files by declaring them as a \c QDeclarativeListProperty in C++.
 	The templated object needs to inherit from a \l {QObject}{QObject}, therefore,
 	the \c File class must also inherit from \c QObject. In the \c Directory class,
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index f890aa6..0609eb8 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -65,10 +65,10 @@
               </div>
               <div class="sectionlist  tricol">
                 <ul>
-                 <!--   <li><a href="qt-basic-concepts.html">Programming with Qt</a></li> -->
-                    <li><a href="qt-basic-concepts.html">Basic Qt Architecture</a></li>
-                    <li><a href="developing-with-qt.html">Cross-platform &amp; Platform-specific Development</a></li>
-                    <li><a href="technology-apis.html">Qt &amp; standard technologies </a></li>
+                    <li><a href="qt-basic-concepts.html">Basic Concepts</a></li>
+                    <li><a href="qt-gui-concepts.html">UI Components</a></li>
+                    <li><a href="developing-with-qt.html">Cross-platform &amp; Platform-specific</a></li>
+                    <li><a href="technology-apis.html">Qt API's for standard technologies </a></li>
                     <li><a href="best-practices.html">Qt How-to's &amp; best practices</a></li>
                 </ul>
               </div>
@@ -77,8 +77,9 @@
                     <li><a href="declarativeui.html">Qt Quick</a></li>
                     <li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li>
                     <li><a href="qdeclarativeelements.html">QML Elements</a></li>
-                    <li><a href="qt-gui-concepts.html">UI components</a></li>
-                <!--    <li><a href="declarativeui.html">Qt & GUI design</a></li> -->
+                    <li><a href="model-view-programming.html">Model/View Programming</a></li>
+                    <li><a href="qt-network.html">Network Programming</a></li>
+                    <li><a href="qt-graphics.html">Graphics and Printing</a></li>
                 </ul>
               </div>
             </div>
@@ -94,14 +95,14 @@
               </div>
               <div class="section sectionlist">
                 <ul>
-                  <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a> (online)</li>
+                  <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a></li>
                   <li><a href="designer-manual.html">Qt Designer</a></li>
                   <li><a href="linguist-manual.html">Qt Linguist</a></li>
                   <li><a href="assistant-manual.html">Qt Assistant</a></li>
                   <li><a href="qmake-manual.html">Qt qmake</a></li>
-                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a> (online)</li>
-                  <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a> (online)</li>
-                  <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a> (online)</li>
+                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a></li>
+                  <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a></li>
+                  <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a></li>
                   <li><a href="qvfb.html">Virtual Framebuffer</a></li>
                 </ul>
               </div>
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index a81bfb2..c35d71c 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -40,7 +40,7 @@
     \header \o {2,1} \bold{Modules for general software development}
     \row \o \l{QtCore} \o Core non-graphical classes used by other modules
     \row \o \l{QtGui} \o Graphical user interface (GUI) components
-    \row \o \l{QtMultimedia} \o Classes for low-level multimedia functionality
+    \row \o \l{qtmultimedia-module.html}{QtMultimedia} \o Classes for low-level multimedia functionality
     \row \o \l{QtNetwork} \o Classes for network programming
     \row \o \l{QtOpenGL} \o OpenGL support classes
     \row \o \l{QtOpenVG} \o OpenVG support classes
@@ -82,9 +82,6 @@
 /*!
     \module QtCore
     \title QtCore Module
-    \contentspage All Modules
-    \previouspage All Modules
-    \nextpage QtGui
     \ingroup modules
 
     \keyword QtCore
@@ -101,9 +98,6 @@
 /*!
     \module QtGui
     \title QtGui Module
-    \contentspage All Modules
-    \previouspage QtCore
-    \nextpage QtNetwork
     \ingroup modules
 
     \brief The QtGui module extends QtCore with GUI functionality.
@@ -118,9 +112,6 @@
     \module QtMultimedia
     \page qtmultimedia-module.html
     \title QtMultimedia Module
-    \contentspage All Modules
-    \previouspage QtCore
-    \nextpage QtNetwork
     \ingroup modules
 
     \brief The QtMultimedia module provides low-level multimedia functionality.
@@ -142,9 +133,6 @@
 /*!
     \module QtNetwork
     \title QtNetwork Module
-    \contentspage All Modules
-    \previouspage QtMultimedia
-    \nextpage QtOpenGL
     \ingroup modules
 
     \brief The QtNetwork module provides classes to make network programming
@@ -164,9 +152,6 @@
 /*!
     \module QtOpenGL
     \title QtOpenGL Module
-    \contentspage All Modules
-    \previouspage QtNetwork
-    \nextpage QtOpenVG
     \ingroup modules
 
     \brief The QtOpenGL module offers classes that make it easy to
@@ -217,9 +202,6 @@
     \module QtOpenVG
     \title QtOpenVG Module
     \since 4.6
-    \contentspage All Modules
-    \previouspage QtOpenGL
-    \nextpage QtScript
     \ingroup modules
 
     \brief The QtOpenVG module is a plugin that provides support for
@@ -272,9 +254,6 @@
 	\module QtScript
 	\title QtScript Module
 	\since 4.3
-	\contentspage All Modules
-	\previouspage QtOpenVG
-	\nextpage QtScriptTools
 	\ingroup modules
 
 	\brief The QtScript module provides classes for making Qt applications scriptable.
@@ -332,9 +311,6 @@
   \module QtScriptTools
   \title QtScriptTools Module
   \since 4.5
-  \contentspage All Modules
-  \previouspage QtScript
-  \nextpage QtSql
   \ingroup modules
 
   \brief The QtScriptTools module provides additional components for applications that use Qt Script.
@@ -356,9 +332,6 @@
 /*!
     \module QtSql
     \title QtSql Module
-    \contentspage All Modules
-    \previouspage QtScript
-    \nextpage QtSvg
     \ingroup modules
 
     To include the definitions of the module's classes, use the
@@ -379,9 +352,6 @@
         \module QtSvg
         \title QtSvg Module
         \since 4.1
-        \contentspage All Modules
-        \previouspage QtSql
-        \nextpage QtWebKit
         \ingroup modules
 
         \brief The QtSvg module provides classes for displaying and creating SVG files.
@@ -430,9 +400,6 @@
 /*!
     \module QtXml
     \title QtXml Module
-    \contentspage All Modules
-    \previouspage QtSvg
-    \nextpage QtXmlPatterns
     \ingroup modules
 
     \brief The QtXml module provides a stream reader and writer for
@@ -457,9 +424,6 @@
     \module QtXmlPatterns
     \title QtXmlPatterns Module
     \since 4.4
-    \contentspage All Modules
-    \previouspage QtXml
-    \nextpage Phonon Module
     \ingroup modules
 
     \brief The QtXmlPatterns module provides support for XPath,
@@ -537,9 +501,6 @@
     \page phonon-module.html
     \module Phonon
     \title Phonon Module
-    \contentspage All Modules
-    \previouspage QtXmlPatterns
-    \nextpage Qt3Support
     \ingroup modules
 
     \brief The Phonon module contains namespaces and classes for multimedia functionality.
@@ -607,9 +568,6 @@
 /*!
     \module Qt3Support
     \title Qt3Support Module
-    \contentspage All Modules
-    \previouspage Phonon Module
-    \nextpage QtDesigner
     \ingroup modules
 
     \keyword Qt3Support
@@ -640,9 +598,6 @@
 /*!
     \module QtDesigner
     \title QtDesigner Module
-    \contentspage All Modules
-    \previouspage Qt3Support
-    \nextpage QtUiTools
     \ingroup modules
 
     \brief The QtDesigner module provides classes that allow you to
@@ -667,9 +622,6 @@
     \module QtUiTools
     \title QtUiTools Module
     \since 4.1
-    \contentspage All Modules
-    \previouspage QtDesigner
-    \nextpage QtHelp
     \ingroup modules
 
     \brief The QtUiTools module provides classes to handle forms created 
@@ -703,9 +655,6 @@
 /*!
     \module QtHelp
     \title QtHelp Module
-    \contentspage All Modules
-    \previouspage QtUiTools
-    \nextpage QtTest
     \ingroup modules
 
     \brief The QtHelp module provides classes for integrating
@@ -762,9 +711,6 @@
 /*!
     \module QtTest
     \title QtTest Module
-    \contentspage All Modules
-    \previouspage QtHelp
-    \nextpage QAxContainer
     \ingroup modules
 
     \keyword QtTest
@@ -792,9 +738,6 @@
 /*!
     \module QAxContainer
     \title QAxContainer Module
-    \contentspage All Modules
-    \previouspage QtTest
-    \nextpage QAxServer
     \ingroup modules
 
     \brief The QAxContainer module is a Windows-only extension for
@@ -844,9 +787,6 @@
 /*!
     \module QAxServer
     \title QAxServer Module
-    \contentspage All Modules
-    \previouspage QAxContainer
-    \nextpage QtDBus module
     \ingroup modules
 
     \brief The QAxServer module is a Windows-only static library that
@@ -896,8 +836,6 @@
 /*!
     \module QtDBus
     \title QtDBus module
-    \contentspage All Modules
-    \previouspage QAxServer
     \ingroup modules
 
     \keyword QtDBus
diff --git a/doc/src/objectmodel/metaobjects.qdoc b/doc/src/objectmodel/metaobjects.qdoc
index dd00c5e..0597cd6 100644
--- a/doc/src/objectmodel/metaobjects.qdoc
+++ b/doc/src/objectmodel/metaobjects.qdoc
@@ -28,8 +28,9 @@
 /*!
     \page metaobjects.html
     \title The Meta-Object System
-    \ingroup qt-basic-concepts
     \brief An overview of Qt's meta-object system and introspection capabilities.
+
+    \ingroup qt-basic-concepts
     \keyword meta-object
     \target Meta-Object System
 
diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc
index 356aaaf..dca332e 100644
--- a/doc/src/objectmodel/properties.qdoc
+++ b/doc/src/objectmodel/properties.qdoc
@@ -28,8 +28,9 @@
 /*!
     \page properties.html
     \title The Property System
-    \ingroup qt-basic-concepts
     \brief An overview of Qt's property system.
+   
+    \ingroup qt-basic-concepts
     \target Qt's Property System
 
     Qt provides a sophisticated property system similar to the ones
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index b72df98..3c02705 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -29,7 +29,6 @@
     \page overviews.html
 
     \title All Overviews and HOWTOs
-	\ingroup qt-basic-concepts
 
     \generatelist overviews
 */
@@ -64,7 +63,7 @@
 
 /*!
     \group qt-graphics
-    \title Qt Graphics and Painting
+    \title Qt Graphics and Printing
 
     \brief The Qt components for doing graphics.
 
diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc
index e5eb75d..4c6fd91 100644
--- a/doc/src/painting-and-printing/paintsystem.qdoc
+++ b/doc/src/painting-and-printing/paintsystem.qdoc
@@ -273,7 +273,7 @@
     
     \previouspage Paint Devices and Backends
     \contentspage The Paint System
-    \nextpage The Coordinate System
+    \nextpage Coordinate System
 
     \section1 Drawing
 
@@ -395,7 +395,7 @@
     \page paintsystem-images.html
     \title Reading and Writing Image Files
 
-    \previouspage The Coordinate System
+    \previouspage Coordinate System
     \contentspage The Paint System
     \nextpage Styling
 
@@ -554,5 +554,5 @@
     \endtable
     
     For more information about widget styling and appearance, see the
-    \l{Styles &amp Style Aware Widgets}.
+    \l{Styles and Style Aware Widgets}.
 */
diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc
index 98096a0..b39a01c 100755
--- a/doc/src/tutorials/modelview.qdoc
+++ b/doc/src/tutorials/modelview.qdoc
@@ -80,8 +80,8 @@
 
 /*!
     \page modelview-part1.html
-    \contentspage {modelview-index.html}{Model/View Contents}
-    \previouspage {modelview-index.html}{Model/View Contents}
+    \contentspage {modelview.html}{Model/View Contents}
+    \previouspage {modelview.html}{Model/View Contents}
     \nextpage {modelview-part2.html}{Developing a Simple Model/View Application}
     \title An Introduction to Model/View Programming
 
diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc
index 798a7a1..d2687ea 100644
--- a/doc/src/widgets-and-layouts/layout.qdoc
+++ b/doc/src/widgets-and-layouts/layout.qdoc
@@ -37,9 +37,9 @@
     \brief A tour of the standard layout managers and an introduction to custom
     layouts.
     
-    \previouspage Widget Classes
+    \previouspage Widgets and Layouts
     \contentspage Widgets and Layouts
-    \nextpage {Implementing Styles and Style Aware Widgets}{Styles}
+    \nextpage {Styles and Style Aware Widgets}{Styles}
 
     \ingroup frameworks-technologies
 
diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc
index eab7014..180260b 100644
--- a/doc/src/widgets-and-layouts/styles.qdoc
+++ b/doc/src/widgets-and-layouts/styles.qdoc
@@ -33,7 +33,7 @@
 
 /*!
     \page style-reference.html
-    \title Styles &amp Style Aware Widgets
+    \title Styles and Style Aware Widgets
     \ingroup qt-gui-concepts
     \brief Styles and the styling of widgets.
 
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 1390376..475de3d 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -32,7 +32,7 @@
 
     \ingroup frameworks-technologies
 
-    \previouspage {Implementing Styles and Style Aware Widgets}{Styles}
+    \previouspage {Styles and Style Aware Widgets}{Styles}
     \contentspage Widgets and Layouts
     \nextpage The Style Sheet Syntax
 
diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc
index f2475c2..fbce744 100644
--- a/doc/src/widgets-and-layouts/widgets.qdoc
+++ b/doc/src/widgets-and-layouts/widgets.qdoc
@@ -29,7 +29,6 @@
   \page widgets-and-layouts.html
   \title Widgets and Layouts
   \ingroup qt-gui-concepts
-  \ingroup qt-basic-concepts
   \brief The primary elements for designing user interfaces in Qt.
 
   \section1 Widgets
@@ -68,7 +67,7 @@
 
   \section1 Widget Styles
 
-  \l{Styles &amp Style Aware Widgets}{Styles} draw on behalf of
+  \l{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.
diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc
index 74df2aa..bcf9c0e 100644
--- a/doc/src/windows-and-dialogs/dialogs.qdoc
+++ b/doc/src/windows-and-dialogs/dialogs.qdoc
@@ -27,14 +27,9 @@
 
 /*!
     \group standard-dialogs
-    \ingroup qt-basic-concepts
-    \title Standard Dialog Classes
-*/
-
-/*!
-    \group dialog-classes
-    \ingroup qt-basic-concepts
-    \title Classes for Building Dialogs
+    \ingroup qt-gui-concepts
+    \title Standard Dialogs
+    \brief A list of Qt classes for implementing standard dialogs. 
 */
 
 /*!
@@ -43,7 +38,7 @@
     \ingroup qt-gui-concepts
     \brief An overview over dialog windows.
     
-    \previouspage The Application Main Window
+    \previouspage Application Main Window
     \contentspage Application Windows and Dialogs
     \nextpage Desktop Integration