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

4 files changed, 6 insertions, 3 deletions

diff --git a/doc/src/demos/guitartuner.qdoc b/doc/src/demos/guitartuner.qdoc
index c6697652a9..8678db11df 100644
--- a/doc/src/demos/guitartuner.qdoc
+++ b/doc/src/demos/guitartuner.qdoc
@@ -40,5 +40,6 @@ code to the Qt Quick UI.
 
     The example is hosted in Projects Forum Nokia: https://projects.forum.nokia.com/guitartuner
 
+\note This demonstration requires QtMobility libraries.
     \image qml-guitartuner-example.png
 */
diff --git a/doc/src/demos/mobiledemos.qdoc b/doc/src/demos/mobiledemos.qdoc
index 47241a60e0..15fac7ed42 100644
--- a/doc/src/demos/mobiledemos.qdoc
+++ b/doc/src/demos/mobiledemos.qdoc
@@ -34,6 +34,8 @@
     capabilities. 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/qml-qtbubblelevel.qdoc b/doc/src/demos/qml-qtbubblelevel.qdoc
index 63ac286e3f..82ea4dc931 100644
--- a/doc/src/demos/qml-qtbubblelevel.qdoc
+++ b/doc/src/demos/qml-qtbubblelevel.qdoc
@@ -37,6 +37,8 @@ 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
 
+\note This demonstration requires QtMobility libraries.
+
     \image qml-qtbubblelevel-demo.png
 
     \section1 Initialising the application
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 69bb03815a..2d404004a1 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -80,7 +80,7 @@
             \o \l{qt-deployment}{Deploying and Publishing Applications to Ovi Store}
             \endlist
             \list
-            \o \l{Getting Started Guides}{Qt and Qt Quick Programming Guides}
+            \o \l{Getting Started Guides}{Qt and Qt Quick Programming Tutorials}
             \endlist
         \enddiv
         \div {class="sectionlist normallist"}
@@ -135,8 +135,6 @@ innovative solutions using Qt.
         \div {class="sectionlist normallist"}
             \list
             \o \l{QML Elements}
-            \endlist
-            \list
             \o \l{external: Qt Mobility Manual}{Qt Mobility APIs}
             \o \l{external: Qt Mobility QML Plugins}{Mobility QML Plugins}
             \endlist