Remove more references to demos.

Change-Id: I431184cd0534c86047706fdaa1045b2935de5d7a
Reviewed-on: http://codereview.qt.nokia.com/1307
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie

4 files changed, 14 insertions, 17 deletions

diff --git a/doc/src/demos/affine.qdoc b/doc/src/examples/affine.qdoc
index c14a452849..2d70fa8951 100644
--- a/doc/src/demos/affine.qdoc
+++ b/doc/src/examples/affine.qdoc
@@ -29,7 +29,7 @@
     \example painting/affine
     \title Affine Transformations
 
-    In this demo we show Qt's ability to perform affine transformations
+    In this example we show Qt's ability to perform affine transformations
     on painting operations.
 
     \image affine-demo.png
diff --git a/doc/src/examples/books.qdoc b/doc/src/examples/books.qdoc
index 64a4613b13..9fa7fdfc8c 100644
--- a/doc/src/examples/books.qdoc
+++ b/doc/src/examples/books.qdoc
@@ -27,9 +27,9 @@
 
 /*!
     \example sql/books
-    \title Books Demonstration
+    \title Books
 
-    The Books demonstration shows how Qt's SQL classes can be used with the model/view
+    The Books example shows how Qt's SQL classes can be used with the model/view
     framework to create rich user interfaces for information stored in a database.
 
     \image books-demo.png
diff --git a/doc/src/examples/styledemo.qdoc b/doc/src/examples/styleexample.qdoc
index 5a5bb5b47d..f3ab3b17d6 100644
--- a/doc/src/examples/styledemo.qdoc
+++ b/doc/src/examples/styleexample.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example embedded/styledemo
+    \example embedded/styleexample
     \title Embedded Styles
 
     \image styledemo-demo.png
diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc
index 35454f4268..9cbba47b60 100644
--- a/doc/src/tutorials/modelview.qdoc
+++ b/doc/src/tutorials/modelview.qdoc
@@ -777,7 +777,7 @@
 
     \section2 4.2 Qt Documentation
 
-    Qt 4.7 comes with 17 examples and 2 Demonstrations for model/view.
+    Qt 5.0 comes with 19 examples for model/view.
     The examples can be found on the \l{Item Views Examples} page.
 
     \table
@@ -842,6 +842,11 @@
             \o  QStandardItemModel
             \o
         \row
+            \o  Interview
+            \o  Multiple
+            \o  Custom item model
+            \o  Multiple views
+        \row
             \o  Pixelator
             \o  QTableView
             \o  Custom table model
@@ -872,23 +877,15 @@
             \o  QStandardItemModel
             \o  Custom delegate that uses a spin box as a cell editor
         \row
+            \o  Spreadsheet
+            \o  {2, 1}  QTableView
+            \o  Custom delegates
+        \row
             \o  Star Delegate
             \o  {2, 1}  QTableWidget
             \o  Comprehensive custom delegate example.
     \endtable
 
-    \l{Qt Demonstrations}{Demonstrations} are similar to examples except that no
-    walkthrough is provided for the code. Demonstrations are typically more
-    feature rich than examples.
-
-    \list
-       \o   The \bold Interview demonstration shows the same model and
-            selection being shared between three different views.
-       \o   The \bold Spreadsheet demonstration illustrates the use of a
-            table view as a spreadsheet, using custom delegates to render
-            each item according to the type of data it contains.
-    \endlist
-
     A \l{Model/View Programming}{reference document} for model/view technology
     is also available.
 */