26 files changed, 49 insertions, 49 deletions
diff --git a/doc/src/demos/affine.qdoc b/doc/src/demos/affine.qdoc
index adc1a78681..c14a452849 100644
--- a/doc/src/demos/affine.qdoc
+++ b/doc/src/demos/affine.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example demos/affine
+    \example painting/affine
     \title Affine Transformations
 
     In this demo we show Qt's ability to perform affine transformations
diff --git a/doc/src/demos/books.qdoc b/doc/src/examples/books.qdoc
index 7eccd5b8e1..64a4613b13 100644
--- a/doc/src/demos/books.qdoc
+++ b/doc/src/examples/books.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example demos/books
+    \example sql/books
     \title Books Demonstration
 
     The Books demonstration shows how Qt's SQL classes can be used with the model/view
diff --git a/doc/src/demos/boxes.qdoc b/doc/src/examples/boxes.qdoc
index 52ee63baed..92db09d3d7 100644
--- a/doc/src/demos/boxes.qdoc
+++ b/doc/src/examples/boxes.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example demos/boxes
+    \example graphicsview/boxes
     \title Boxes
 
     This demo shows Qt's ability to combine advanced OpenGL rendering with the
diff --git a/doc/src/demos/chip.qdoc b/doc/src/examples/chip.qdoc
index eda0bed02a..07b12f9960 100644
--- a/doc/src/demos/chip.qdoc
+++ b/doc/src/examples/chip.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example demos/chip
+    \example graphicsview/chip
     \title 40000 Chips
 
     This demo shows how to visualize a huge scene with 40000 chip items
diff --git a/doc/src/demos/composition.qdoc b/doc/src/examples/composition.qdoc
index c2eadc7308..53ca3dbf7a 100644
--- a/doc/src/demos/composition.qdoc
+++ b/doc/src/examples/composition.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example demos/composition
+    \example painting/composition
     \title Composition Modes
 
     This demo shows some of the more advanced composition modes supported by Qt.
diff --git a/doc/src/demos/deform.qdoc b/doc/src/examples/deform.qdoc
index 7b11a9a95a..1a81053248 100644
--- a/doc/src/demos/deform.qdoc
+++ b/doc/src/examples/deform.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/deform
+    \example painting/deform
     \title Vector Deformation
 
-    This demo shows how to use advanced vector techniques to draw text 
+    This example shows how to use advanced vector techniques to draw text
     using a \c QPainterPath.
 
     \image deform-demo.png
diff --git a/doc/src/demos/digiflip.qdoc b/doc/src/examples/digiflip.qdoc
index 33f083f957..ae3b18216b 100644
--- a/doc/src/demos/digiflip.qdoc
+++ b/doc/src/examples/digiflip.qdoc
@@ -26,6 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/digiflip
-    \title Digiflip Demonstration
+    \example embedded/digiflip
+    \title Digiflip
 */
diff --git a/doc/src/demos/embeddeddialogs.qdoc b/doc/src/examples/embeddeddialogs.qdoc
index e80f76c113..685bcf8e22 100644
--- a/doc/src/demos/embeddeddialogs.qdoc
+++ b/doc/src/examples/embeddeddialogs.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embeddeddialogs
+    \example graphicsview/embeddeddialogs
     \title Embedded Dialogs
 
     This example shows how to embed standard dialogs into
diff --git a/doc/src/demos/flickable.qdoc b/doc/src/examples/flickable.qdoc
index 540857be96..378bfcaf47 100644
--- a/doc/src/demos/flickable.qdoc
+++ b/doc/src/examples/flickable.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/flickable
-    \title Flickable List Demonstration
+    \example embedded/flickable
+    \title Flickable List
 
     \image flickable-demo.png
 */
diff --git a/doc/src/demos/flightinfo.qdoc b/doc/src/examples/flightinfo.qdoc
index e812dbff75..f3b5e32197 100644
--- a/doc/src/demos/flightinfo.qdoc
+++ b/doc/src/examples/flightinfo.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/flightinfo
-    \title Flight Info Demonstration
+    \example embedded/flightinfo
+    \title Flight Info
 
     \image flightinfo-demo.png
 */
diff --git a/doc/src/demos/gradients.qdoc b/doc/src/examples/gradients.qdoc
index 1f29a4ae10..430ce3ce87 100644
--- a/doc/src/demos/gradients.qdoc
+++ b/doc/src/examples/gradients.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/gradients
+    \example painting/gradients
     \title Gradients
 
-    In this demo we show the various types of gradients that can
+    In this example we show the various types of gradients that can
     be used in Qt.
 
     \image gradients-demo.png
diff --git a/doc/src/demos/interview.qdoc b/doc/src/examples/interview.qdoc
index fa40ed24e8..0be40fda85 100644
--- a/doc/src/demos/interview.qdoc
+++ b/doc/src/examples/interview.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/interview
+    \example itemviews/interview
     \title Interview
 
-    The Interview demonstration explores the flexibility and scalability of the
+    The Interview example explores the flexibility and scalability of the
     model/view framework by presenting an infinitely deep data structure using a model
     and three different types of view.
 
diff --git a/doc/src/demos/lightmaps.qdoc b/doc/src/examples/lightmaps.qdoc
index a8594f9d9b..0b5b807919 100644
--- a/doc/src/demos/lightmaps.qdoc
+++ b/doc/src/examples/lightmaps.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/lightmaps
-    \title Light Maps Demonstration
+    \example embedded/lightmaps
+    \title Light Maps
 
     \image lightmaps-demo.png
 */
diff --git a/doc/src/demos/macmainwindow.qdoc b/doc/src/examples/macmainwindow.qdoc
index 31c02307e7..d245398f4f 100644
--- a/doc/src/demos/macmainwindow.qdoc
+++ b/doc/src/examples/macmainwindow.qdoc
@@ -26,17 +26,17 @@
 ****************************************************************************/
 
 /*!
-  \example demos/macmainwindow
-  \title Mac Main Window Demo
+  \example mainwindows/macmainwindow
+  \title Mac Main Window Example
 
-  This demo shows how to create a main window that has the
+  This example shows how to create a main window that has the
   same appearance as other Mac OS X applications such as Mail or iTunes.
   This includes customizing the item views and QSplitter and wrapping native
   widgets such as the search field.
 
   \image macmainwindow.png
 
-  See \c{$QTDIR/demos/macmainwindow} for the source code.
+  See \c{$QTDIR/examples/mainwindows/macmainwindow} for the source code.
 */
 
 
diff --git a/doc/src/demos/mainwindow.qdoc b/doc/src/examples/mainwindow.qdoc
index dee72022af..ef9d128628 100644
--- a/doc/src/demos/mainwindow.qdoc
+++ b/doc/src/examples/mainwindow.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/mainwindow
+    \example mainwindows/mainwindow
     \title Main Window
 
-    The Main Window demonstration shows Qt's extensive support for tool bars,
+    The Main Window example shows Qt's extensive support for tool bars,
     dock windows, menus, and other standard application features.
 
     \image mainwindow-demo.png
diff --git a/doc/src/demos/pathstroke.qdoc b/doc/src/examples/pathstroke.qdoc
index 8e864e2615..b433a42814 100644
--- a/doc/src/demos/pathstroke.qdoc
+++ b/doc/src/examples/pathstroke.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/pathstroke
+    \example painting/pathstroke
     \title Path Stroking
 
-    In this demo we show some of the various types of pens that can be
+    In this example we show some of the various types of pens that can be
     used in Qt.
 
     \image pathstroke-demo.png
diff --git a/doc/src/demos/raycasting.qdoc b/doc/src/examples/raycasting.qdoc
index 5c03e2092f..ae5be0f707 100644
--- a/doc/src/demos/raycasting.qdoc
+++ b/doc/src/examples/raycasting.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/raycasting
-    \title Ray Casting Demonstration
+    \example embedded/raycasting
+    \title Ray Casting
 
     \image raycasting-demo.png
 */
diff --git a/doc/src/demos/spreadsheet.qdoc b/doc/src/examples/spreadsheet.qdoc
index 5c6b4dfb26..8bcecc99ed 100644
--- a/doc/src/demos/spreadsheet.qdoc
+++ b/doc/src/examples/spreadsheet.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/spreadsheet
+    \example itemviews/spreadsheet
     \title Spreadsheet
 
-    The Spreadsheet demonstration shows how a table view can be used to create a
+    The Spreadsheet example shows how a table view can be used to create a
     simple spreadsheet application. Custom delegates are used to render different
     types of data in distinctive colors.
 
diff --git a/doc/src/demos/sqlbrowser.qdoc b/doc/src/examples/sqlbrowser.qdoc
index 53af037be0..f7ec7951a8 100644
--- a/doc/src/demos/sqlbrowser.qdoc
+++ b/doc/src/examples/sqlbrowser.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/sqlbrowser
+    \example sql/sqlbrowser
     \title SQL Browser
 
-    The SQL Browser demonstration shows how a data browser can be used to visualize
+    The SQL Browser example shows how a data browser can be used to visualize
     the results of SQL statements on a live database.
 
     \image sqlbrowser-demo.png
diff --git a/doc/src/demos/styledemo.qdoc b/doc/src/examples/styledemo.qdoc
index 415d2843b7..5a5bb5b47d 100644
--- a/doc/src/demos/styledemo.qdoc
+++ b/doc/src/examples/styledemo.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/styledemo
-    \title Embedded Styles Demonstration
+    \example embedded/styledemo
+    \title Embedded Styles
 
     \image styledemo-demo.png
 */
diff --git a/doc/src/demos/sub-attaq.qdoc b/doc/src/examples/sub-attaq.qdoc
index 247d0d1fa9..0c8e587463 100644
--- a/doc/src/demos/sub-attaq.qdoc
+++ b/doc/src/examples/sub-attaq.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/sub-attaq
+    \example animation/sub-attaq
     \title Sub-Attaq
 
-    This demo shows Qt's ability to combine \l{The Animation Framework}{the animation framework} 
+    This example shows Qt's ability to combine \l{The Animation Framework}{the animation framework}
     and \l{The State Machine Framework}{the state machine framework} to create a game.
     
     \image sub-attaq-demo.png
diff --git a/doc/src/demos/textedit.qdoc b/doc/src/examples/textedit.qdoc
index 8c50dbacf8..1a1171d542 100644
--- a/doc/src/demos/textedit.qdoc
+++ b/doc/src/examples/textedit.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/textedit
+    \example richtext/textedit
     \title Text Edit
 
-    The Text Edit demonstration shows Qt's rich text editing facilities in action,
+    The Text Edit example shows Qt's rich text editing facilities in action,
     providing an example document for you to experiment with.
 
     \image textedit-demo.png
diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc
index 26b558c15f..2d9f9f770e 100644
--- a/doc/src/examples/transformations.qdoc
+++ b/doc/src/examples/transformations.qdoc
@@ -364,8 +364,8 @@
     QTransform documentation.
 
     The Qt reference documentation provides several painting
-    demos. Among these is the \l {demos/affine}{Affine
-    Transformations} demo that shows Qt's ability to perform
-    transformations on painting operations. The demo also allows the
+    examples. Among these is the \l {painting/affine}{Affine
+    Transformations} example that shows Qt's ability to perform
+    transformations on painting operations. The example also allows the
     user to experiment with the various transformation operations.
 */
diff --git a/doc/src/demos/undo.qdoc b/doc/src/examples/undo.qdoc
index 7b64371f38..29c320ab05 100644
--- a/doc/src/demos/undo.qdoc
+++ b/doc/src/examples/undo.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/undo
+    \example tools/undo
     \title Undo Framework
 
-    This demo shows Qt's undo framework in action.
+    This example shows Qt's undo framework in action.
 
     \image undodemo.png
 
diff --git a/doc/src/painting-and-printing/coordsys.qdoc b/doc/src/painting-and-printing/coordsys.qdoc
index 35702b97da..96eebd01e0 100644
--- a/doc/src/painting-and-printing/coordsys.qdoc
+++ b/doc/src/painting-and-printing/coordsys.qdoc
@@ -195,8 +195,8 @@
     \endtable
 
     You can also twist the coordinate system around the origin using
-    the QPainter::shear() function. See the \l {demos/affine}{Affine
-    Transformations} demo for a visualization of a sheared coordinate
+    the QPainter::shear() function. See the \l {painting/affine}{Affine
+    Transformations} example for a visualization of a sheared coordinate
     system. All the transformation operations operate on QPainter's
     transformation matrix that you can retrieve using the
     QPainter::worldTransform() function. A matrix transforms a point
@@ -285,7 +285,7 @@
 
     For a demonstation of Qt's ability to perform affine
     transformations on painting operations, see the \l
-    {demos/affine}{Affine Transformations} demo which allows the user
+    {painting/affine}{Affine Transformations} example which allows the user
     to experiment with the transformation operations.  See also the \l
     {painting/transformations}{Transformations} example which shows
     how transformations influence the way that QPainter renders
diff --git a/doc/src/sql-programming/sql-programming.qdoc b/doc/src/sql-programming/sql-programming.qdoc
index 68b1a2fe44..55f97484bb 100644
--- a/doc/src/sql-programming/sql-programming.qdoc
+++ b/doc/src/sql-programming/sql-programming.qdoc
@@ -603,7 +603,7 @@
 
     \image qdatawidgetmapper-simple.png
 
-    The \l{demos/books}{Books} demonstration shows how information can
+    The \l{sql/books}{Books} example shows how information can
     be presented for easy access by using QDataWidgetMapper and a set of
     simple input widgets.
 */