Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

1 files changed, 13 insertions, 5 deletions

diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index 4003988..f52fc92 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -46,7 +46,7 @@
     \o \inlineimage qtdemo-small.png
     \o If you run the \l{Examples and Demos Launcher}, you'll see many of Qt's
     widgets in action.
-	
+
     The \l{Qt Widget Gallery} also provides overviews of selected Qt
     widgets in each of the styles used on various supported platforms.
     \endtable
@@ -134,15 +134,23 @@
     \section1 QtWebKit
 
     \list
-    \o \l{Web Browser} demonstrates how Qt's \l{WebKit in Qt}{WebKit module}
-        can be used to implement a small Web browser.
+    \o \l{Web Browser} demonstrates how Qt's \l{QtWebKit} module can be used to
+       implement a small Web browser.
+    \endlist
+
+    \section1 Multimedia
+
+    \list
+    \o \l{demos/spectrum}{Spectrum Analyser} shows how the \l{QtMultimedia}
+       module can be used to manipulate audio as it is played.
     \endlist
 
     \section1 Phonon
 
     \list
-    \o \l{demos/qmediaplayer}{Media Player} demonstrates how the \l{Phonon Module} can be
-    used to implement a basic media player application.
+    \o \l{demos/qmediaplayer}{Media Player} demonstrates how the
+    \l{Phonon Module}{Phonon module} can be used to implement a basic media player
+    application.
     \endlist
 
     \note The Phonon demos are currently not available for the MinGW platform.