Remove references to demos from docs.

Change-Id: I1ae723af883c305ea64a4e46cc3ce889dd3c021b
Reviewed-on: http://codereview.qt.nokia.com/1032
Reviewed-by: Qt Sanity Bot <[email protected]>
Reviewed-by: David Boddie

28 files changed, 33 insertions, 807 deletions

diff --git a/dist/README b/dist/README
index 73c8be1f5d4..815e12be9e3 100644
--- a/dist/README
+++ b/dist/README
@@ -31,16 +31,14 @@ follow these instructions:
 http://qt.nokia.com/doc/%SHORTVERSION%/install-symbian-installer.html
 
 
-DEMOS AND EXAMPLES
+EXAMPLES
 
-Once Qt is installed, we suggest that you take a look at the demos and
-examples to see Qt in action.
+Once Qt is installed, we suggest that you take a look at the examples
+to see Qt in action.
 
-For desktop computers, run the Qt Examples and Demos either by
-typing 'qtdemo' on the command line or through the desktop's Start
-menu. On Mac OS X, you can find it in /Developers/Applications/Qt.
+For desktop computers, run the Qt Examples by opening them in Qt Creator.
 
-For embedded devices, launch the Qt 'fluidlauncher' demo, either through 
+For embedded devices, launch the Qt 'fluidlauncher' example, either through
 the platforms filebrowser or the built in menu system.
 
 
diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc
index 660089c5449..2d9f9f770e5 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 {painting/affine}{Affine
+    examples. Among these is the \l {painting/affine}{Affine
     Transformations} example that shows Qt's ability to perform
-    transformations on painting operations. The demo also allows the
+    transformations on painting operations. The example also allows the
     user to experiment with the various transformation operations.
 */
diff --git a/examples/animation/README b/examples/animation/README
index 6a892f8655e..e723a287229 100644
--- a/examples/animation/README
+++ b/examples/animation/README
@@ -3,36 +3,6 @@ smooth GUI's. By animating Qt properties, the framework provides great freedom
 for animating widgets and other QObjects. The framework can also be used with
 the Graphics View framework.
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
 
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/desktop/README b/examples/desktop/README
index efe569a6040..4a949d1cf7b 100644
--- a/examples/desktop/README
+++ b/examples/desktop/README
@@ -6,36 +6,5 @@ support for desktop services can be used to improve the appearance of
 applications and take advantage of underlying desktop facilities.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/dialogs/README b/examples/dialogs/README
index ab0f884fcb7..090b0110619 100644
--- a/examples/dialogs/README
+++ b/examples/dialogs/README
@@ -5,36 +5,5 @@ Custom dialogs can also be created for specialized modal or modeless
 interactions with users.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/draganddrop/README b/examples/draganddrop/README
index f4efd2e40b4..90dc55bf2f9 100644
--- a/examples/draganddrop/README
+++ b/examples/draganddrop/README
@@ -5,36 +5,5 @@ most appropriate formats.
 Drag and drop can also be implemented for internal use by applications.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/graphicsview/README b/examples/graphicsview/README
index 6c38c18683d..e710fc3c13f 100644
--- a/examples/graphicsview/README
+++ b/examples/graphicsview/README
@@ -5,36 +5,5 @@ These examples demonstrate the fundamental aspects of canvas programming
 with Qt.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/ipc/README b/examples/ipc/README
index 71e2f46c185..83a157a42e9 100644
--- a/examples/ipc/README
+++ b/examples/ipc/README
@@ -1,35 +1,5 @@
 These examples demonstrate IPC support in Qt.
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
 
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/itemviews/README b/examples/itemviews/README
index 0ac70f4904d..bded96a8495 100644
--- a/examples/itemviews/README
+++ b/examples/itemviews/README
@@ -4,36 +4,5 @@ from the way it is represented to the user, and provides support for
 customized rendering through the use of delegates.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/layouts/README b/examples/layouts/README
index edaea784634..589400280d9 100644
--- a/examples/layouts/README
+++ b/examples/layouts/README
@@ -6,36 +6,5 @@ Custom layouts can be used to provide more control over the positions and
 sizes of child widgets.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/linguist/README b/examples/linguist/README
index d1ef0057e48..15817742dac 100644
--- a/examples/linguist/README
+++ b/examples/linguist/README
@@ -2,36 +2,5 @@ Internationalization is a core feature of Qt. These examples show how to
 access translation and localization facilities at run-time.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/mainwindows/README b/examples/mainwindows/README
index 15a6c23e4ba..b63adee6e32 100644
--- a/examples/mainwindows/README
+++ b/examples/mainwindows/README
@@ -5,36 +5,5 @@ separate forms of user input are unified in an integrated action system that
 also supports keyboard shortcuts and accelerator keys in menu items.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/network/README b/examples/network/README
index 23721df4c34..23682e4aefc 100644
--- a/examples/network/README
+++ b/examples/network/README
@@ -5,36 +5,5 @@ These examples demonstrate the fundamental aspects of network programming
 with Qt.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/opengl/README b/examples/opengl/README
index 69bd134246e..b891fb41927 100644
--- a/examples/opengl/README
+++ b/examples/opengl/README
@@ -6,36 +6,5 @@ These examples demonstrate the basic techniques used to take advantage of
 OpenGL in Qt applications.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/openvg/README b/examples/openvg/README
index 5e385ea0cee..3f2a60e9e78 100644
--- a/examples/openvg/README
+++ b/examples/openvg/README
@@ -5,36 +5,6 @@ These examples demonstrate the basic techniques used to take advantage of
 OpenVG in Qt applications.  In particular, the "star" example shows how
 to mix QPainter and OpenVG calls in the same paint event.
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
 
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/painting/README b/examples/painting/README
index 4f9dca01818..541c5531593 100644
--- a/examples/painting/README
+++ b/examples/painting/README
@@ -7,36 +7,5 @@ with Qt, from basic concepts such as drawing simple primitives to the use of
 transformations.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/qtconcurrent/README b/examples/qtconcurrent/README
index af659af2ccc..4a1a149789d 100644
--- a/examples/qtconcurrent/README
+++ b/examples/qtconcurrent/README
@@ -3,36 +3,5 @@ concurrent programming which includes implementations of the well-known
 map-reduce and filter-reduce algorithms.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/qtestlib/README b/examples/qtestlib/README
index e89bf5d7261..7ca55b2eb3d 100644
--- a/examples/qtestlib/README
+++ b/examples/qtestlib/README
@@ -4,35 +4,5 @@ in unit testing frameworks as well as extensions for testing graphical
 user interfaces.
 
 
-The examples in this directory should be run from the command line so
-that output printed to the console can be examined.
-
-Documentation for these examples can be found via the "Tutorial and Examples"
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/qws/README b/examples/qws/README
index d7cf21a5c5e..d24fa59a354 100644
--- a/examples/qws/README
+++ b/examples/qws/README
@@ -3,36 +3,5 @@ for use on systems with limited resources, specialized hardware, and small
 screens.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/richtext/README b/examples/richtext/README
index 6697b237f59..647029b8a26 100644
--- a/examples/richtext/README
+++ b/examples/richtext/README
@@ -7,36 +7,5 @@ Text is rendered using anti-aliased outline fonts to provide the best
 possible on-screen representation.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/sql/README b/examples/sql/README
index 56b4b3e11fb..70f910114a1 100644
--- a/examples/sql/README
+++ b/examples/sql/README
@@ -5,36 +5,5 @@ SQL support is integrated with Qt's model/view architecture, making it easier
 to provide GUI integration for your database applications.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/statemachine/README b/examples/statemachine/README
index 2879e67d65d..a0ac35a89b7 100644
--- a/examples/statemachine/README
+++ b/examples/statemachine/README
@@ -1,36 +1,6 @@
 Qt is provided with a powerful hierchical finite state machine through
 the Qt State Machine classes.
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
 
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/threads/README b/examples/threads/README
index e4b426f9c7f..c5427ea9a99 100644
--- a/examples/threads/README
+++ b/examples/threads/README
@@ -5,36 +5,5 @@ mechanism can now be used to communicate between threads.
 Additionally, it is now possible to move objects between threads.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/tools/README b/examples/tools/README
index b0926f2fb63..db5c107c827 100644
--- a/examples/tools/README
+++ b/examples/tools/README
@@ -5,36 +5,5 @@ Other classes provide application infrastructure support, handling plugin
 loading and managing configuration files.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/tutorials/README b/examples/tutorials/README
index 0aab26348b3..54c0b177061 100644
--- a/examples/tutorials/README
+++ b/examples/tutorials/README
@@ -1,37 +1,6 @@
 Qt is supplied with tutorials that have been written to provide developers
 with an introduction to the Qt API.
 
-The example and demo launcher can be used to explore these tutorials, lets
-you view the documentation in Qt Assistant, and is able to launch each part
-in a series of tutorial programs.
 
-Documentation for tutorials can be found in the Tutorial and Examples section
-of the Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
+Documentation for tutorials can be found in the Tutorials
+link in the main documentation.
diff --git a/examples/webkit/webkit-guide/_index.html b/examples/webkit/webkit-guide/_index.html
index 709f951c8fe..5d7dd11d638 100644
--- a/examples/webkit/webkit-guide/_index.html
+++ b/examples/webkit/webkit-guide/_index.html
@@ -94,7 +94,6 @@ a[href^='http://waplabdc.nokia-boston.com']:before { content: url(http://waplabd
                                          <ul>
                                <li><a href="all-examples.html">Examples</a></li>
                                <li><a href="tutorials.html">Tutorials</a></li>
-                               <li><a href="demos.html">Demos</a></li>
                                <li><a href="qdeclarativeexamples.html">QML Examples</a></li>
                         </ul>
                                          </li>
@@ -159,7 +158,6 @@ a[href^='http://waplabdc.nokia-boston.com']:before { content: url(http://waplabd
         <ul id="ul003">
               <li class="defaultLink"><a href="all-examples.html">Examples</a></li>
               <li class="defaultLink"><a href="tutorials.html">Tutorials</a></li>
-              <li class="defaultLink"><a href="demos.html">Demos</a></li>
               <li class="defaultLink"><a href="qdeclarativeexamples.html">QML Examples</a></li>
             </ul>
           </div>
diff --git a/examples/widgets/README b/examples/widgets/README
index fd16c67acd1..e862f07b714 100644
--- a/examples/widgets/README
+++ b/examples/widgets/README
@@ -9,36 +9,5 @@ be used to change the appearance of standard widgets and appropriately
 written custom widgets.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/xml/README b/examples/xml/README
index a6d81bb58a7..a1a963006d2 100644
--- a/examples/xml/README
+++ b/examples/xml/README
@@ -5,36 +5,5 @@ classes enable more complex document-level operations to be performed on
 XML files.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.