diff --git a/doc/config/arthurtext.qdocconf b/doc/config/arthurtext.qdocconf
index 473152dec0abe877edb316df4350f52686caa1c0..dc6b72cb6071375b6ab4f2b0ba0b65dbdc4277ff 100644
--- a/doc/config/arthurtext.qdocconf
+++ b/doc/config/arthurtext.qdocconf
@@ -2,5 +2,5 @@ include(qt.qdocconf)
headerdirs =
sourcedirs =
sources = $QTDIR/doc/src/qt4-arthur.qdoc
-outputdir = $QTDIR/demos/arthur/html
-HTML.{postheader,address} = ""
\ No newline at end of file
+outputdir = $QTDIR/qtdoc/examples/arthur/html
+HTML.{postheader,address} = ""
diff --git a/doc/config/modules/qtactiveqt.qdocconf b/doc/config/modules/qtactiveqt.qdocconf
index 281c85fed22de06d11dadef3a942ccb34dbb55da..bb706884ec655a2ea4986295783ba64848524e9a 100644
--- a/doc/config/modules/qtactiveqt.qdocconf
+++ b/doc/config/modules/qtactiveqt.qdocconf
@@ -6,7 +6,6 @@ sourcedirs += $QT_ACTIVEQT_SOURCES/.. \
$QT_ACTIVEQT_SOURCES/../../tools
exampledirs += $QT_ACTIVEQT_SOURCES/../.. \
- $QT_ACTIVEQT_SOURCES/../../demos \
$QT_ACTIVEQT_SOURCES/../../doc/src \
$QT_ACTIVEQT_SOURCES/../../examples
diff --git a/doc/config/modules/qtclucene.qdocconf b/doc/config/modules/qtclucene.qdocconf
index 59fdd6ac9beb2d6458c01610a0e4089dc09c6e48..d058067d93f8eda81d14eea2e50dc8669baac4f8 100644
--- a/doc/config/modules/qtclucene.qdocconf
+++ b/doc/config/modules/qtclucene.qdocconf
@@ -6,7 +6,6 @@ sourcedirs += $QT_CLUCENE_SOURCES/../../.. \
$QT_CLUCENE_SOURCES/../../../../doc/src
exampledirs += $QT_CLUCENE_SOURCES/../../../.. \
- $QT_CLUCENE_SOURCES/../../../../demos \
$QT_CLUCENE_SOURCES/../../../../doc/src \
$QT_CLUCENE_SOURCES/../../../../examples
diff --git a/doc/config/modules/qtcore.qdocconf b/doc/config/modules/qtcore.qdocconf
index 15e5c30bcb200cc2937e72ed1f38df4940a937e6..046181c84784b9f988377af74c7dc40ec9b73ee1 100644
--- a/doc/config/modules/qtcore.qdocconf
+++ b/doc/config/modules/qtcore.qdocconf
@@ -6,7 +6,6 @@ sourcedirs += $QT_CORE_SOURCES/.. \
$QT_CORE_SOURCES/../../tools
exampledirs += $QT_CORE_SOURCES/../.. \
- $QT_CORE_SOURCES/../../demos \
$QT_CORE_SOURCES/../../doc/src \
$QT_CORE_SOURCES/../../examples
diff --git a/doc/config/modules/qtdeclarative.qdocconf b/doc/config/modules/qtdeclarative.qdocconf
index bcc99a2c873744c106a6f8ef40192ca9edcdf033..f60e44fb7e2ab84ad7110b27f7b2785d4b6a619b 100644
--- a/doc/config/modules/qtdeclarative.qdocconf
+++ b/doc/config/modules/qtdeclarative.qdocconf
@@ -6,7 +6,6 @@ sourcedirs += $QT_DECLARATIVE_SOURCES/.. \
$QT_DECLARATIVE_SOURCES/../../tools
exampledirs += $QT_DECLARATIVE_SOURCES/../.. \
- $QT_DECLARATIVE_SOURCES/../../demos \
$QT_DECLARATIVE_SOURCES/../../doc/src \
$QT_DECLARATIVE_SOURCES/../../examples
diff --git a/doc/config/modules/qtlocation.qdocconf b/doc/config/modules/qtlocation.qdocconf
index bba96e505546beab1105c09eb66c347c692c2bd7..efddc93fce79727cdb03f8e0a1b5213d45d80616 100644
--- a/doc/config/modules/qtlocation.qdocconf
+++ b/doc/config/modules/qtlocation.qdocconf
@@ -4,7 +4,6 @@ sourcedirs += $QT_LOCATION_SOURCES \
$QT_LOCATION_SOURCES/../../doc/src
exampledirs += $QT_LOCATION_SOURCES/../.. \
- $QT_LOCATION_SOURCES/../../demos \
$QT_LOCATION_SOURCES/../../doc/src \
$QT_LOCATION_SOURCES/../../examples
diff --git a/doc/config/modules/qtmultimedia.qdocconf b/doc/config/modules/qtmultimedia.qdocconf
index 0e42b01aabae8b33524b76d61cec29b3ec836908..adaede562b6c7cff4c09970e483bc956a9f2b20f 100644
--- a/doc/config/modules/qtmultimedia.qdocconf
+++ b/doc/config/modules/qtmultimedia.qdocconf
@@ -4,7 +4,6 @@ sourcedirs += $QT_MULTIMEDIA_SOURCES/.. \
$QT_MULTIMEDIA_SOURCES/../../doc/src
exampledirs += $QT_MULTIMEDIA_SOURCES/../.. \
- $QT_MULTIMEDIA_SOURCES/../../demos \
$QT_MULTIMEDIA_SOURCES/../../doc/src \
$QT_MULTIMEDIA_SOURCES/../../examples
diff --git a/doc/config/modules/qtphonon.qdocconf b/doc/config/modules/qtphonon.qdocconf
index 18032f2095e514abca1b88eee6104cbd77b3ef3f..a4ddf264757a023b0ae7900eec6aab122496dd25 100644
--- a/doc/config/modules/qtphonon.qdocconf
+++ b/doc/config/modules/qtphonon.qdocconf
@@ -4,7 +4,6 @@ sourcedirs += $QT_PHONON_SOURCES/.. \
$QT_PHONON_SOURCES/../../../../doc/src
exampledirs += $QT_PHONON_SOURCES/../../../.. \
- $QT_PHONON_SOURCES/../../../../demos \
$QT_PHONON_SOURCES/../../../../doc/src \
$QT_PHONON_SOURCES/../../../../examples
diff --git a/doc/config/modules/qtsvg.qdocconf b/doc/config/modules/qtsvg.qdocconf
index 1816f77276d0bb54eed60e8997cada22254a069f..ca78303d23ac26f0dc495eff51483cdfcd552d28 100644
--- a/doc/config/modules/qtsvg.qdocconf
+++ b/doc/config/modules/qtsvg.qdocconf
@@ -4,7 +4,6 @@ sourcedirs += $QT_SVG_SOURCES/.. \
$QT_SVG_SOURCES/../../doc/src
exampledirs += $QT_SVG_SOURCES/../.. \
- $QT_SVG_SOURCES/../../demos \
$QT_SVG_SOURCES/../../doc/src \
$QT_SVG_SOURCES/../../examples
diff --git a/doc/config/modules/qtwebkit-examples-and-demos.qdocconf b/doc/config/modules/qtwebkit-examples-and-demos.qdocconf
index 23c01d2ada01cb6ff5da60989b88b01902c514c5..fd13527dfd102f89a79e6c4e40eaf90fccc892fa 100644
--- a/doc/config/modules/qtwebkit-examples-and-demos.qdocconf
+++ b/doc/config/modules/qtwebkit-examples-and-demos.qdocconf
@@ -3,7 +3,6 @@ headerdirs +=
sourcedirs += $QT_WEBKIT_EXAMPLES_AND_DEMOS_SOURCES/doc/src
exampledirs += $QT_WEBKIT_EXAMPLES_AND_DEMOS_SOURCES \
- $QT_WEBKIT_EXAMPLES_AND_DEMOS_SOURCES/demos \
$QT_WEBKIT_EXAMPLES_AND_DEMOS_SOURCES/doc/src \
$QT_WEBKIT_EXAMPLES_AND_DEMOS_SOURCES/examples
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf
index aabaf0f3a3b2c1a11e3b1e5e4f9fa9fed8016de0..dbaecb46b1efcd862c07a0a89edb5efab9eab78a 100644
--- a/doc/config/qt-html-templates-online.qdocconf
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -49,7 +49,6 @@ HTML.postheader = \
" <ul> \n" \
" <li><a href=\"all-examples.html\">Examples</a></li> \n" \
" <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
- " <li><a href=\"demos.html\">Demos</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
" </ul> \n" \
" </li> \n" \
@@ -113,7 +112,6 @@ HTML.postheader = \
" <ul id=\"ul003\">\n" \
" <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
" </ul> \n" \
" </div>\n" \
diff --git a/doc/config/qt-html-templates_ja_JP-online.qdocconf b/doc/config/qt-html-templates_ja_JP-online.qdocconf
index 8dc17af7411f25460e1ed42ed17a456cbba1600a..d0494b95903e0c9ea6f0fecefbd79fe4fd4f9a5c 100644
--- a/doc/config/qt-html-templates_ja_JP-online.qdocconf
+++ b/doc/config/qt-html-templates_ja_JP-online.qdocconf
@@ -52,7 +52,6 @@ HTML.postheader = \
" <ul id=\"topmenuexample\"> \n" \
" <li><a href=\"all-examples.html\">Examples</a></li> \n" \
" <li><a href=\"tutorials.html\">ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«</a></li> \n" \
- " <li><a href=\"demos.html\">Demos</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
" </ul> \n" \
@@ -108,7 +107,6 @@ HTML.postheader = \
" <ul id=\"ul003\">\n" \
" <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"tutorials.html\">ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
" </ul> \n" \
diff --git a/doc/config/qt-html-templates_zh_CN-online.qdocconf b/doc/config/qt-html-templates_zh_CN-online.qdocconf
index e7e822090f819cb49cd7b97c0987eaa12683e13d..c85ace8e06bf983b766171f67fb3d49f94e96098 100644
--- a/doc/config/qt-html-templates_zh_CN-online.qdocconf
+++ b/doc/config/qt-html-templates_zh_CN-online.qdocconf
@@ -52,7 +52,6 @@ HTML.postheader = \
" <ul id=\"topmenuexample\"> \n" \
" <li><a href=\"all-examples.html\">Examples</a></li> \n" \
" <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
- " <li><a href=\"demos.html\">Demos</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
" </ul> \n" \
@@ -108,7 +107,6 @@ HTML.postheader = \
" <ul id=\"ul003\">\n" \
" <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
" </ul> \n" \
diff --git a/doc/config/qt-html-templates_zh_CN.qdocconf b/doc/config/qt-html-templates_zh_CN.qdocconf
index b4c8f7b1a6e48766e2f1e630a9ea9349463ddf7d..0bbd3070fe75cffeeb7b80b4def9f281b5b74b74 100644
--- a/doc/config/qt-html-templates_zh_CN.qdocconf
+++ b/doc/config/qt-html-templates_zh_CN.qdocconf
@@ -52,7 +52,6 @@ HTML.postheader = \
" <ul id=\"topmenuexample\"> \n" \
" <li><a href=\"all-examples.html\">Examples</a></li> \n" \
" <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
- " <li><a href=\"demos.html\">Demos</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
" <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
" </ul> \n" \
@@ -108,7 +107,6 @@ HTML.postheader = \
" <ul id=\"ul003\">\n" \
" <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
" </ul> \n" \
diff --git a/doc/src/demos/anomaly.qdoc b/doc/src/examples/anomaly.qdoc
similarity index 92%
rename from doc/src/demos/anomaly.qdoc
rename to doc/src/examples/anomaly.qdoc
index 9d19099a1740bbbb42172b3711d558a0970fadcc..54ce815596f845680c671ac1f7a85cdad68c64d1 100644
--- a/doc/src/demos/anomaly.qdoc
+++ b/doc/src/examples/anomaly.qdoc
@@ -26,8 +26,8 @@
****************************************************************************/
/*!
- \example demos/embedded/anomaly
- \title Anomaly Demonstration
+ \example embedded/anomaly
+ \title Anomaly
\image anomaly-demo.png
*/
diff --git a/doc/src/demos/arthurplugin.qdoc b/doc/src/examples/arthurplugin.qdoc
similarity index 87%
rename from doc/src/demos/arthurplugin.qdoc
rename to doc/src/examples/arthurplugin.qdoc
index c5daf183225c0b7d2de953f2477113730de82bb1..76e55a28f19a7ee95dff66197e393e41b37b1259 100644
--- a/doc/src/demos/arthurplugin.qdoc
+++ b/doc/src/examples/arthurplugin.qdoc
@@ -26,15 +26,15 @@
****************************************************************************/
/*!
- \example demos/arthurplugin
+ \example painting/arthurplugin
\title Arthur Plugin
- In this demo we demonstrate the abilities of Qt's painting system
+ In this example we demonstrate the abilities of Qt's painting system
in combination with \QD's custom widget plugin facilities.
\image arthurplugin-demo.png
- The specialized widgets used in the other demonstrations of the Arthur
+ The specialized widgets used in the other examples of the Arthur
painting system are provided as custom widgets to be used with \QD.
Since each of the widgets provides a set of signals and slots, the
effects they show can be controlled by connecting them up to standard
diff --git a/doc/src/demos/browser.qdoc b/doc/src/examples/browser.qdoc
similarity index 91%
rename from doc/src/demos/browser.qdoc
rename to doc/src/examples/browser.qdoc
index 2cfc933a57e553f6559c38695bdff4e3c437d3ae..6c9d075e92e052dbcb44b87a2149cb8611bf6b84 100644
--- a/doc/src/demos/browser.qdoc
+++ b/doc/src/examples/browser.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \page demos-browser.html
+ \page examples-browser.html
\title Web Browser
- The Web Browser demonstration shows Qt's WebKit module in action,
+ The Web Browser example shows Qt's WebKit module in action,
providing a little Web browser application.
\image browser-demo.png
diff --git a/doc/src/demos/guitartuner.qdoc b/doc/src/examples/guitartuner.qdoc
similarity index 94%
rename from doc/src/demos/guitartuner.qdoc
rename to doc/src/examples/guitartuner.qdoc
index df15c04347a048d4130d4d4038f5a6d9a990ee1e..2c22404b7c326cdef42cab38c6258b8dbbc53a5f 100644
--- a/doc/src/demos/guitartuner.qdoc
+++ b/doc/src/examples/guitartuner.qdoc
@@ -28,7 +28,7 @@
/*!
\page guitartuner_example.html
\title Guitar Tuner Example
- \example demos/mobile/guitartuner
+ \example mobile/guitartuner
The Guitar Tuner application can be used to tune guitar strings by analyzing the
audio recorded by the device microphone. Guitar Tuner can be also used in the
@@ -40,6 +40,6 @@ code to the Qt Quick UI.
The example is hosted in Projects Forum Nokia: https://projects.forum.nokia.com/guitartuner
-\note This demonstration requires QtMobility libraries.
+\note This example requires QtMobility libraries.
\image qml-guitartuner-example.png
*/
diff --git a/doc/src/demos/mediaplayer.qdoc b/doc/src/examples/mediaplayer.qdoc
similarity index 90%
rename from doc/src/demos/mediaplayer.qdoc
rename to doc/src/examples/mediaplayer.qdoc
index 8f35ee51d8ebe10d400154e962b2b7d43dcabf89..3d411e359ddf526b2de0636fe70a7e88889c804f 100644
--- a/doc/src/demos/mediaplayer.qdoc
+++ b/doc/src/examples/mediaplayer.qdoc
@@ -26,10 +26,10 @@
****************************************************************************/
/*!
- \example demos/qmediaplayer
+ \example phonon/qmediaplayer
\title Media Player
- The Media Player demonstration shows how \l{Phonon Module}{Phonon}
+ The Media Player example shows how \l{Phonon Module}{Phonon}
can be used in Qt applications to handle audio and video playback.
\image qmediaplayer-demo.png
diff --git a/doc/src/demos/mobiledemos.qdoc b/doc/src/examples/mobiledemos.qdoc
similarity index 83%
rename from doc/src/demos/mobiledemos.qdoc
rename to doc/src/examples/mobiledemos.qdoc
index 2aaa2584576de0364aa621a999a2e74acf540dd9..28228982af58c9ba9ecb2c845be309fe7f5d6e20 100644
--- a/doc/src/demos/mobiledemos.qdoc
+++ b/doc/src/examples/mobiledemos.qdoc
@@ -27,14 +27,14 @@
/*!
- \example demos/mobile/quickhit
- \title Quick Hit Demo
+ \example mobile/quickhit
+ \title Quick Hit Example
- This demo shows how to use Mobility APIs to access device audio
+ This example shows how to use Mobility APIs to access device audio
capabilities. Uses the multimedia and systeminfo modules of
\l{external: Qt Mobility Manual}{Qt Mobility}.
- \note This demonstration requires QtMobility libraries.
+ \note This example requires QtMobility libraries.
*/
diff --git a/doc/src/examples/qml-calculator.qdoc b/doc/src/examples/qml-calculator.qdoc
index 0624cb4f0481cc0447bd993db83d06cb51d1f46b..2fda79262ca1d1d79ae4370e12b68c90321f3eb2 100644
--- a/doc/src/examples/qml-calculator.qdoc
+++ b/doc/src/examples/qml-calculator.qdoc
@@ -27,9 +27,9 @@
/*!
\title Calculator
- \example demos/declarative/calculator
+ \example declarative/calculator
- This demo shows how to write a simple calculator application in QML and JavaScript.
+ This example shows how to write a simple calculator application in QML and JavaScript.
\image qml-calculator-example.png
*/
diff --git a/doc/src/examples/qml-flickr.qdoc b/doc/src/examples/qml-flickr.qdoc
index c23c0ba055ba215cd3c1750e5cd1e3f679382063..7e4fd5ec57b16f9555a8c936e67c0ca26ed51f02 100644
--- a/doc/src/examples/qml-flickr.qdoc
+++ b/doc/src/examples/qml-flickr.qdoc
@@ -27,9 +27,9 @@
/*!
\title Flickr Mobile
- \example demos/declarative/flickr
+ \example declarative/flickr
- This demo shows how to write a mobile Flickr browser application in QML.
+ This example shows how to write a mobile Flickr browser application in QML.
\image qml-flickr-demo.png
*/
diff --git a/doc/src/examples/qml-minehunt.qdoc b/doc/src/examples/qml-minehunt.qdoc
index ac13456ed602ed7cb90d0042607f941d79f59226..8b0033c063cec178ad841b4491fb0f5f570a5bfc 100644
--- a/doc/src/examples/qml-minehunt.qdoc
+++ b/doc/src/examples/qml-minehunt.qdoc
@@ -27,9 +27,9 @@
/*!
\title Minehunt
- \example demos/declarative/minehunt
+ \example declarative/minehunt
- This demo shows how to create a simple Minehunt game, using QML for the
+ This example shows how to create a simple Minehunt game, using QML for the
UI and C++ for the game logic.
\image qml-minehunt-demo.png
diff --git a/doc/src/examples/qml-photoviewer.qdoc b/doc/src/examples/qml-photoviewer.qdoc
index 5ecbf8429c3901c76cffdf64e3f03c8516f554d7..a8659b2b5d483e07a7a06d0fc45d49bf3f069b8b 100644
--- a/doc/src/examples/qml-photoviewer.qdoc
+++ b/doc/src/examples/qml-photoviewer.qdoc
@@ -27,9 +27,9 @@
/*!
\title Photo Viewer
- \example demos/declarative/photoviewer
+ \example declarative/photoviewer
- This demo shows how to write a Flickr photo viewer application in QML.
+ This example shows how to write a Flickr photo viewer application in QML.
\image qml-photoviewer-demo.png
*/
diff --git a/doc/src/examples/qml-rssnews.qdoc b/doc/src/examples/qml-rssnews.qdoc
index beea4d34f126cdad39a6dd18d00da0e55f214afe..b8936152d622ae5a4d63e87af32665db1244d4e9 100644
--- a/doc/src/examples/qml-rssnews.qdoc
+++ b/doc/src/examples/qml-rssnews.qdoc
@@ -27,9 +27,9 @@
/*!
\title RSS News
- \example demos/declarative/rssnews
+ \example declarative/rssnews
- This demo shows how to write a RSS news reader in QML.
+ This example shows how to write a RSS news reader in QML.
\image qml-rssnews-demo.png
*/
diff --git a/doc/src/examples/qml-samegame.qdoc b/doc/src/examples/qml-samegame.qdoc
index 81a26a3ab895b78cd323c6571a1d90cac0bfdb2a..4c9ccf45039ea6651eca1c4f9e71d45ee6f911eb 100644
--- a/doc/src/examples/qml-samegame.qdoc
+++ b/doc/src/examples/qml-samegame.qdoc
@@ -27,9 +27,9 @@
/*!
\title Same Game
- \example demos/declarative/samegame
+ \example declarative/samegame
- This demo shows how to write a 'Same Game' game in QML, using Javascript
+ This example shows how to write a 'Same Game' game in QML, using Javascript
for all the game logic.
\image qml-samegame-demo.png
diff --git a/doc/src/examples/qml-snake.qdoc b/doc/src/examples/qml-snake.qdoc
index bce0e7104c5df030816ab8f550101e212cafab8f..d4cdaf56f1c14e4a682636b02b256a4930583348 100644
--- a/doc/src/examples/qml-snake.qdoc
+++ b/doc/src/examples/qml-snake.qdoc
@@ -27,9 +27,9 @@
/*!
\title Snake
- \example demos/declarative/snake
+ \example declarative/snake
- This demo shows how to write a Snake game in QML, controlled by the
+ This example shows how to write a Snake game in QML, controlled by the
keyboard as well as the mouse.
\image qml-snake-demo.png
diff --git a/doc/src/examples/qml-twitter.qdoc b/doc/src/examples/qml-twitter.qdoc
index 3ebabb4576f76c5f50ddd9165ac447f16a84cdc8..7f2e9a6b6634432bb61c0f9fbad89dbb771a44a3 100644
--- a/doc/src/examples/qml-twitter.qdoc
+++ b/doc/src/examples/qml-twitter.qdoc
@@ -27,9 +27,9 @@
/*!
\title Twitter Mobile
- \example demos/declarative/twitter
+ \example declarative/twitter
- This demo shows how to write a mobile Twitter search client in QML. Use it to
+ This example shows how to write a mobile Twitter search client in QML. Use it to
see what people think about Qt Quick!
\image qml-twitter-demo.png
diff --git a/doc/src/examples/qml-webbrowser.qdoc b/doc/src/examples/qml-webbrowser.qdoc
index 08416af17e40cd66af41f1608eb559fec460323a..48eadfe4c5e195b8f4411495a77e22ba70f4b38c 100644
--- a/doc/src/examples/qml-webbrowser.qdoc
+++ b/doc/src/examples/qml-webbrowser.qdoc
@@ -27,9 +27,9 @@
/*!
\title QML Web Browser
- \example demos/declarative/webbrowser
+ \example declarative/webbrowser
- This demo shows how to write a simple web browser in QML by combining the
+ This example shows how to write a simple web browser in QML by combining the
WebView element with other components including scroll bars,
\l Flickable views and TextInput fields.
diff --git a/doc/src/demos/qtdemo.qdoc b/doc/src/examples/qtdemo.qdoc
similarity index 93%
rename from doc/src/demos/qtdemo.qdoc
rename to doc/src/examples/qtdemo.qdoc
index f4d3cbf17fb3e365fc0f3c9303cbfff675802fa8..0f25bcb9b8a461d10f708086d64700c15aba5269 100644
--- a/doc/src/demos/qtdemo.qdoc
+++ b/doc/src/examples/qtdemo.qdoc
@@ -27,11 +27,11 @@
/*!
\page qtdemo.html
- \title Examples and Demos Launcher
+ \title Examples Launcher
\ingroup qttools
\keyword qtdemo
- The Examples and Demos Launcher (\c qtdemo) allows the user to browse the
+ The Examples Launcher (\c qtdemo) allows the user to browse the
examples and demonstrations included with Qt, access the documentation
associated with each of them, and launch them as separate applications.
diff --git a/doc/src/demos/spectrum.qdoc b/doc/src/examples/spectrum.qdoc
similarity index 91%
rename from doc/src/demos/spectrum.qdoc
rename to doc/src/examples/spectrum.qdoc
index 7e9842640d45c42e1c040f4a5ee9f907f6807a1d..7c038f04100d2447bb90c7a62035551068719b70 100644
--- a/doc/src/demos/spectrum.qdoc
+++ b/doc/src/examples/spectrum.qdoc
@@ -26,17 +26,17 @@
****************************************************************************/
/*!
- \example demos/spectrum
+ \example multimedia/spectrum
\title Spectrum Analyzer
- The Spectrum Analyzer demo shows how the \l{QtMultimedia Module} can be
+ The Spectrum Analyzer example shows how the \l{QtMultimedia Module} can be
used in Qt applications to capture and then play back an audio stream.
\image spectrum-demo.png
Because QtMultimedia allows the application to access the raw audio
stream, the data can either be inspected or modified by the application.
- The Spectrum Analyzer demo displays three pieces of information while
+ The Spectrum Analyzer example displays three pieces of information while
audio is being either captured or played back:
\list