Doc: Updating pages and linking them to the overviews.

15 files changed, 45 insertions, 9 deletions

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index ed8b734fa1..9b44273682 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -28,6 +28,8 @@
 /*!
 \title Qt Quick
 \page qtquick.html
+\ingroup qt-gui-concepts
+
 
 \brief Qt Quick provides a declarative framework for building highly
 dynamic, custom user interfaces.
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index f28337d618..0c07747d44 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -31,6 +31,8 @@
     \brief An overview of Qt's unit testing framework.
 
     \ingroup frameworks-technologies
+    \ingroup qt-basic-concepts
+	
     \keyword qtestlib
 
     The QTestLib framework, provided by Nokia, is a tool for unit
diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc
index 4134cfec40..cbc15589b3 100644
--- a/doc/src/frameworks-technologies/accessible.qdoc
+++ b/doc/src/frameworks-technologies/accessible.qdoc
@@ -36,6 +36,7 @@
     \brief How to make your applications accessible to those with disabilities.
 
     \ingroup technology-apis
+    \ingroup qt-basic-concepts
     \ingroup best-practices
 
     \tableofcontents
diff --git a/doc/src/frameworks-technologies/containers.qdoc b/doc/src/frameworks-technologies/containers.qdoc
index 797326e38c..cf5fe73cd6 100644
--- a/doc/src/frameworks-technologies/containers.qdoc
+++ b/doc/src/frameworks-technologies/containers.qdoc
@@ -46,6 +46,7 @@
     \title Container Classes
     \ingroup technology-apis
     \ingroup groups
+    \ingroup qt-basic-concepts
     \keyword container class
     \keyword container classes
 
diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc
index 71478230d0..20bb750edd 100644
--- a/doc/src/frameworks-technologies/graphicsview.qdoc
+++ b/doc/src/frameworks-technologies/graphicsview.qdoc
@@ -34,6 +34,8 @@
     \page graphicsview.html
     \title Graphics View Framework
     \ingroup qt-graphics
+    \ingroup qt-basic-concepts
+	
     \brief An overview of the Graphics View framework for interactive 2D
     graphics.
 
diff --git a/doc/src/frameworks-technologies/ipc.qdoc b/doc/src/frameworks-technologies/ipc.qdoc
index 26a8cecc71..775243a672 100644
--- a/doc/src/frameworks-technologies/ipc.qdoc
+++ b/doc/src/frameworks-technologies/ipc.qdoc
@@ -31,6 +31,7 @@
     \brief Inter-Process communication in Qt applications.
 
     \ingroup technology-apis
+    \ingroup qt-basic-concepts
     \ingroup qt-network
 
     Qt provides several ways to implement Inter-Process Communication
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index e230c06bd5..7a1fb403e1 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -27,12 +27,12 @@
 
 /*!
     \group model-view
-	\ingroup qt-basic-concepts
     \title Model/View Classes
 */
 
 /*!
     \page model-view-programming.html
+	\ingroup qt-basic-concepts
 
     \title Model/View Programming
     \brief A guide to Qt's extensible model/view architecture.
diff --git a/doc/src/frameworks-technologies/plugins-howto.qdoc b/doc/src/frameworks-technologies/plugins-howto.qdoc
index a66bae041b..5103bdc4a3 100644
--- a/doc/src/frameworks-technologies/plugins-howto.qdoc
+++ b/doc/src/frameworks-technologies/plugins-howto.qdoc
@@ -47,6 +47,8 @@
     functionality provided by Qt.
 
     \ingroup frameworks-technologies
+    \ingroup qt-basic-concepts
+	
 
     \keyword QT_DEBUG_PLUGINS
     \keyword QT_NO_PLUGIN_CHECK
diff --git a/doc/src/frameworks-technologies/richtext.qdoc b/doc/src/frameworks-technologies/richtext.qdoc
index 42a57ec723..a9ee0b2c5c 100644
--- a/doc/src/frameworks-technologies/richtext.qdoc
+++ b/doc/src/frameworks-technologies/richtext.qdoc
@@ -36,7 +36,8 @@
     \brief An overview of Qt's rich text processing, editing and display features.
 
     \ingroup frameworks-technologies
-
+    \ingroup qt-basic-concepts
+	
     \nextpage Rich Text Document Structure
 
     The Scribe framework provides a set of classes for reading and manipulating
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 5d9c819ad5..8b6e337148 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -39,6 +39,8 @@
     \brief Information about Qt's support for internationalization and multiple languages.
     \nextpage Writing Source Code for Translation
 
+    \ingroup qt-basic-concepts
+	
     \keyword internationalization
     \keyword i18n
 
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 8e12fd381a..2dd44f69bb 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -35,21 +35,21 @@
 
 /*!
     \group qt-basic-concepts
-    \title Basic Qt Architecture
+    \title Programming with Qt
 
     \brief The basic architecture of the Qt cross-platform application and UI framework.
 
     Qt is a cross-platform application and UI framework for writing
     web-enabled applications for desktop, mobile, and embedded
-    operating systems. These pages explain basic architectural
-    concepts of Qt:
-
+    operating systems. This page contains links to articles and overviews
+	explaining key components and techniuqes used in Qt development.
+	
     \generatelist {related}
  */
 
 /*!
     \group qt-gui-concepts
-    \title Qt Desktop UI Components
+    \title UI Design with Qt
 
     \brief The Qt components for constructing native look & feel desktop UI's.
 
@@ -82,7 +82,7 @@
 
 /*!
     \group technology-apis
-    \title Qt API's for other technologies
+    \title Qt and Key Technologies
 
     These pages document Qt's API's for some widely-used standards and
     technologies.
@@ -122,7 +122,7 @@
 
 /*!
     \group best-practices
-    \title How-To's and Best Practices
+    \title Best Practices Guides
 
     \brief How-To Guides and Best Practices
 
@@ -133,3 +133,16 @@
 
     \generatelist{related}
 */
+/*! 
+
+	\group licensing
+	\title Qt Licenses and Credits
+
+	\brief About the licenses used for Qt, and some credits to our contributors.
+
+	This page contains information on the different licenses Qt is shipped with,
+	and credits to some of our many contributers.
+
+	\generatelist {related}
+
+*/
diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc
index 4c6fd915d1..deb9c8b38b 100644
--- a/doc/src/painting-and-printing/paintsystem.qdoc
+++ b/doc/src/painting-and-printing/paintsystem.qdoc
@@ -50,6 +50,8 @@
     \brief A system for painting on the screen or on print devices using the same API
     \ingroup qt-graphics
     \ingroup frameworks-technologies
+    \ingroup qt-basic-concepts
+	
 
     Qt's paint system enables painting on screen and print devices
     using the same API, and is primarily based on the QPainter,
diff --git a/doc/src/porting/qt4-mainwindow.qdoc b/doc/src/porting/qt4-mainwindow.qdoc
index 7d2a400ae4..b160d63916 100644
--- a/doc/src/porting/qt4-mainwindow.qdoc
+++ b/doc/src/porting/qt4-mainwindow.qdoc
@@ -28,7 +28,12 @@
 /*!
     \page qt4-mainwindow.html
     \title The Qt 4 Main Window Classes
+	\ingroup qt-basic-concepts
+    
+	\brief Overview of the Main Window concept and Classes
+	
 
+	
     \contentspage {What's New in Qt 4}{Home}
     \previouspage The Scribe Classes
     \nextpage The New Qt Designer
diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc
index d2687ea3c3..32dddd7b02 100644
--- a/doc/src/widgets-and-layouts/layout.qdoc
+++ b/doc/src/widgets-and-layouts/layout.qdoc
@@ -33,6 +33,7 @@
 /*!
     \page layout.html
     \title Layout Management
+    \ingroup qt-basic-concepts
     \ingroup qt-gui-concepts
     \brief A tour of the standard layout managers and an introduction to custom
     layouts.
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 5c7257099b..cc36fa2306 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -31,6 +31,7 @@
     \brief How to use style sheets to customize the appearance of widgets.
 
     \ingroup frameworks-technologies
+    \ingroup qt-basic-concepts
 
     \previouspage {Styles and Style Aware Widgets}{Styles}
     \contentspage Widgets and Layouts