Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  Add briefs for the new 4.8 examples.
  Add briefs to the new 4.8 demos.

12 files changed, 25 insertions, 18 deletions

diff --git a/doc/src/demos/glhypnotizer.qdoc b/doc/src/demos/glhypnotizer.qdoc
index 468a4ac..0782e90 100644
--- a/doc/src/demos/glhypnotizer.qdoc
+++ b/doc/src/demos/glhypnotizer.qdoc
@@ -29,7 +29,7 @@
     \example demos/glhypnotizer
     \title GL Hypnotizer
 
-    This demo shows how to use OpenGL from a seperate thread.
+    \brief The GL Hypnotizer demo shows how to use OpenGL from a seperate thread.
 
     \image glhypnotizer-demo.png
 
diff --git a/doc/src/demos/guitartuner.qdoc b/doc/src/demos/guitartuner.qdoc
index df15c04..8a1e875 100644
--- a/doc/src/demos/guitartuner.qdoc
+++ b/doc/src/demos/guitartuner.qdoc
@@ -27,16 +27,19 @@
 
 /*!
     \page guitartuner_example.html
-    \title Guitar Tuner Example
+    \title Guitar Tuner Demonstration
     \example demos/mobile/guitartuner
 
+\brief The Guitar Tuner demo demonstrates the audio-in and audio-out interfaces of
+Qt Mobility Multimedia, and integrating Qt code in a Qt Quick UI.
+
 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
 listening mode. It will then play the audio by the corresponding frequency, and
 the user can tune the guitar by ear. The application demonstrates the audio-in
 and the audio-out interfaces of
 \l{external: Mobility Multimedia}{Qt Mobility Multimedia} and integrating Qt
-code to the Qt Quick UI.
+code in a Qt Quick UI.
 
     The example is hosted in Projects Forum Nokia: https://projects.forum.nokia.com/guitartuner
 
diff --git a/doc/src/demos/mobiledemos.qdoc b/doc/src/demos/mobiledemos.qdoc
index 2aaa258..6af10f6 100644
--- a/doc/src/demos/mobiledemos.qdoc
+++ b/doc/src/demos/mobiledemos.qdoc
@@ -30,8 +30,10 @@
     \example demos/mobile/quickhit
     \title Quick Hit Demo
 
-    This demo shows how to use Mobility APIs to access device audio
-    capabilities. Uses the multimedia and systeminfo modules of
+    \brief The Quick Hit demo shows how to use Mobility APIs to access device audio
+    capabilities.
+    
+    The demo uses the multimedia and systeminfo modules of
     \l{external: Qt Mobility Manual}{Qt Mobility}.
 
     \note This demonstration requires QtMobility libraries.
diff --git a/doc/src/demos/qcamera.qdoc b/doc/src/demos/qcamera.qdoc
index f41afd7..be3f667 100644
--- a/doc/src/demos/qcamera.qdoc
+++ b/doc/src/demos/qcamera.qdoc
@@ -27,10 +27,10 @@
 
 /*!
     \page qcamera_example.html
-    \title QCamera Example
+    \title QCamera Demo
     \example demos/mobile/qcamera
 
-    This Qt C++ application demonstrates how to use Multimedia, Messaging and Contacts modules from \l{external: Qt Mobility Manual}{Qt Mobility}.
+    \brief The QCamera demo shows how to use Multimedia, Messaging and Contacts modules from Qt Mobility.
 
     \image qcameraexample.png
 
diff --git a/doc/src/demos/qml-qtbubblelevel.qdoc b/doc/src/demos/qml-qtbubblelevel.qdoc
index 052dd50..146f604 100644
--- a/doc/src/demos/qml-qtbubblelevel.qdoc
+++ b/doc/src/demos/qml-qtbubblelevel.qdoc
@@ -27,13 +27,15 @@
 
 /*!
     \page qtbubblelevel_example.html
-    \title Qt Bubble Level Example
+    \title Qt Bubble Level Demo
     \example demos/mobile/qtbubblelevel
 
-Qt Bubble Level is a simple application that uses
-\l{external: Qt Mobility Manual}{Qt Mobility's} accelerometer APIs and hardware
+\brief Qt Bubble Level is a simple application that uses
+Qt Mobility's accelerometer APIs and hardware
 sensor information to calculate the inclination of the device and presents this
-as atraditional bubble level. The application provides a calibration feature to
+as atraditional bubble level.
+
+The application provides a calibration feature to
 handle any possible errors in accelerometer readings. The example is hosted in
 Projects Forum Nokia: https://projects.forum.nokia.com/qtbubblelevel
 
diff --git a/doc/src/demos/styledemo.qdoc b/doc/src/demos/styledemo.qdoc
index 13cab2b..d05d091 100644
--- a/doc/src/demos/styledemo.qdoc
+++ b/doc/src/demos/styledemo.qdoc
@@ -29,7 +29,7 @@
     \example demos/embedded/styledemo
     \title Embedded Styles Demonstration
 
-    The Embedded Styles demo shows how to use Qt Style APIs in embedded contexts
+    \brief The Embedded Styles demo shows how to use Qt Style APIs in embedded contexts
 
     \image styledemo-demo.png
 */
diff --git a/doc/src/examples/multicastreceiver.qdoc b/doc/src/examples/multicastreceiver.qdoc
index 1a0f3b5..96a011f 100644
--- a/doc/src/examples/multicastreceiver.qdoc
+++ b/doc/src/examples/multicastreceiver.qdoc
@@ -29,7 +29,7 @@
     \example network/multicastreceiver
     \title Multicast Receiver Example
 
-    The Multicast Receiever example shows how to receive information that is
+    \brief The Multicast Receiever example shows how to receive information that is
     sent to a multicast group.
 
     \image multicastreceiver-example.png
diff --git a/doc/src/examples/multicastsender.qdoc b/doc/src/examples/multicastsender.qdoc
index 55b3804..c5b7531 100644
--- a/doc/src/examples/multicastsender.qdoc
+++ b/doc/src/examples/multicastsender.qdoc
@@ -29,7 +29,7 @@
     \example network/multicastsender
     \title Multicast Sender Example
 
-    The Multicast Sender example shows how to send information to multiple
+    \brief The Multicast Sender example shows how to send information to multiple
     clients in a multicast group.
 
     \image multicastsender-example.png
diff --git a/doc/src/examples/simplewebplugin.qdoc b/doc/src/examples/simplewebplugin.qdoc
index 4c95b58..185cc85 100644
--- a/doc/src/examples/simplewebplugin.qdoc
+++ b/doc/src/examples/simplewebplugin.qdoc
@@ -29,7 +29,7 @@
     \example webkit/simplewebplugin
     \title Simple Web Plugin Example
 
-    The Simple Web Plugin example shows how to embed a regular Qt widget into a
+    \brief The Simple Web Plugin example shows how to embed a regular Qt widget into a
     Web page displayed using QWebView.
 
     \image webkit-simplewebplugin.png A table widget embedded in a Web page.
diff --git a/doc/src/examples/undoframework.qdoc b/doc/src/examples/undoframework.qdoc
index 370435d..2fdb4cf 100644
--- a/doc/src/examples/undoframework.qdoc
+++ b/doc/src/examples/undoframework.qdoc
@@ -29,7 +29,7 @@
     \example tools/undoframework 
     \title Undo Framework Example
 
-    \brief This example shows how to implement undo/redo functionality 
+    \brief The Undo Framework example shows how to implement undo/redo functionality 
     with the Qt undo framework.
 
     \image undoframeworkexample.png The Undo Diagram Example
diff --git a/doc/src/examples/webftpclient.qdoc b/doc/src/examples/webftpclient.qdoc
index c3d456d..47006f9 100644
--- a/doc/src/examples/webftpclient.qdoc
+++ b/doc/src/examples/webftpclient.qdoc
@@ -29,7 +29,7 @@
     \example webkit/webftpclient
     \title Web FTP Client Example
 
-    The Web FTP Client example shows how to add support for a new protocol
+    \brief The Web FTP Client example shows how to add support for a new protocol
     to QtWebKit-based applications.
 
     \image webkit-webftpclient.png An FTP client displaying the contents of the ftp.qt.nokia.com site.
diff --git a/doc/src/examples/webplugin.qdoc b/doc/src/examples/webplugin.qdoc
index dcf4fb5..c607bef 100644
--- a/doc/src/examples/webplugin.qdoc
+++ b/doc/src/examples/webplugin.qdoc
@@ -29,7 +29,7 @@
     \example webkit/webplugin
     \title Web Plugin Example
 
-    The Web Plugin example shows how to communicate between a Qt widget
+    \brief The Web Plugin example shows how to communicate between a Qt widget
     embedded in a Web page and the page itself.
 
     \image webkit-webplugin.png A table widget embedded in a Web page.