Remove references to demos.

Change-Id: I21f935b6de8bdf6a5205f6048cdabf97e16b613a
Reviewed-on: http://codereview.qt.nokia.com/1060
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

4 files changed, 28 insertions, 28 deletions

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 970e96c39d..b2f9deca6b 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -36,7 +36,7 @@ It assumes that you already know the basics of QML (for example, from reading th
 \l{QML Tutorial}{simple tutorial}). 
 
 In this tutorial we write a game, \e {Same Game}, based on the Same Game application
-included in the declarative \c demos directory, which looks like this:
+included in the declarative \c examples directory, which looks like this:
 
 \image declarative-samegame.png
 
@@ -461,5 +461,5 @@ By following this tutorial you've seen how you can write a fully functional appl
 \endlist
 
 There is so much more to learn about QML that we haven't been able to cover in this tutorial. Check out all the
-demos and examples and the \l {Qt Quick}{documentation} to see all the things you can do with QML!
+examples and the \l {Qt Quick}{documentation} to see all the things you can do with QML!
 */
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index c3a6c313aa..a322491190 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -27,33 +27,37 @@
 
 /*!
   \page qdeclarativeexamples.html
-  \title QML Examples and Demos
+  \title QML Examples
   \brief Building UIs with QML
   \ingroup all-examples
 
 
-Qt includes a set of examples and demos that show how to use various aspects
-of QML. The examples are small demonstrations of particular QML components, 
-while the demos contain more complete and functional applications.
+Qt includes a set of examples that show how to use various aspects
+of QML. The examples are demonstrations of particular QML components,
+some are small code snippets, while others contain more complete and
+functional applications.
 
-To run the examples and demos, open them in Qt Creator or use the included
+To run the examples, open them in Qt Creator or use the included
 \l {QML Viewer} tool. The \l {QML Viewer} can be run from the command line:
 
 \code
-    qmlviewer $QTDIR/demos/declarative/samegame/samegame.qml
+    qmlviewer $QTDIR/examples/declarative/samegame/samegame.qml
 \endcode
 
 On Mac OS X, you can run the included "QMLViewer" application from the
 Finder, or use the command line:
 
 \code
-    QMLViewer.app/Contents/MacOS/QMLViewer $QTDIR/demos/declarative/samegame/samegame.qml
+    QMLViewer.app/Contents/MacOS/QMLViewer $QTDIR/examples/declarative/samegame/samegame.qml
 \endcode
 
 
-\section1 Demos
+The examples can be found in Qt's \c examples/declarative directory.
+
+
+\section1 Functional Applications
 
-The QML demos integrate a variety of features to demonstrate how QML
+These QML examples integrate a variety of features to demonstrate how QML
 can be used to produce sophisticated interfaces and applications:
 
 
@@ -61,59 +65,55 @@ can be used to produce sophisticated interfaces and applications:
 \row
 
 \o 
-\l{demos/declarative/calculator}{Calculator}
+\l{declarative/calculator}{Calculator}
 \image qml-calculator-example-small.png
 
 \o 
-\l{demos/declarative/flickr}{Flickr Mobile}
+\l{declarative/flickr}{Flickr Mobile}
 \image qml-flickr-demo-small.png
 
 \o 
-\l{demos/declarative/minehunt}{Minehunt}
+\l{declarative/minehunt}{Minehunt}
 \image qml-minehunt-demo-small.png
 
 \row
 
 \o 
-\l{demos/declarative/photoviewer}{Photo Viewer}
+\l{declarative/photoviewer}{Photo Viewer}
 \image qml-photoviewer-demo-small.png
 
 \o 
-\l{demos/declarative/rssnews}{RSS News Reader}
+\l{declarative/rssnews}{RSS News Reader}
 \image qml-rssnews-demo-small.png
 
 \o 
-\l{demos/declarative/samegame}{Same Game}
+\l{declarative/samegame}{Same Game}
 \image qml-samegame-demo-small.png
 
 \row
 
 \o 
-\l{demos/declarative/snake}{Snake}
+\l{declarative/snake}{Snake}
 \image qml-snake-demo-small.png
 
 \o 
-\l{demos/declarative/twitter}{Twitter}
+\l{declarative/twitter}{Twitter}
 \image qml-twitter-demo-small.png
 
 \o 
-\l{demos/declarative/webbrowser}{Web Browser}
+\l{declarative/webbrowser}{Web Browser}
 \image qml-webbrowser-demo-small.png
 
 \endtable
 
-The demos can be found in Qt's \c demos/declarative directory.
 
+\section1 Code Snippets
 
-\section1 Examples
-
-The QML examples are small, simple applications that show how to use a particular
+These QML examples are small, simple applications that show how to use a particular
 QML component or feature. If you are new
 to QML, you may also find the \l{QML Tutorial}{Hello World} and 
 \l {QML Advanced Tutorial}{Same Game} tutorials useful.
 
-The examples can be found in Qt's \c examples/declarative directory.
-
 \section2 Animation
 \list
 \o \l{declarative/animation/basics}{Basics}
diff --git a/doc/src/declarative/network.qdoc b/doc/src/declarative/network.qdoc
index cb83542e14..f04d198506 100644
--- a/doc/src/declarative/network.qdoc
+++ b/doc/src/declarative/network.qdoc
@@ -114,7 +114,7 @@ content by URLs that can then be used directly in QML. For example, using these
 to access an on-line photography service would provide the QML application with URLs to
 photographs, which can be directly set on an \l Image \c source property.
 
-See the \tt demos/declarative/flickr for a real demonstration of this.
+See the \tt examples/declarative/flickr for a real demonstration of this.
 
 
 \section1 Configuring the Network Access Manager
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index 36db62862e..2399a6e2ad 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -125,7 +125,7 @@ XmlListModel {
 }
 \endqml
 
-The \l{demos/declarative/rssnews}{RSS News demo} shows how XmlListModel can
+The \l{declarative/rssnews}{RSS News demo} shows how XmlListModel can
 be used to display an RSS feed.