Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

1 files changed, 4 insertions, 7 deletions

diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index a355f9f..15d7652 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -42,12 +42,9 @@
 /*!
   \page qdeclarativeexamples.html
   \title QML Examples and Demos
+  \brief Building UI's with QML
   \ingroup all-examples
 
-\previouspage Graphics View Examples
-\contentspage Qt Examples
-\nextpage Painting Examples
-
 \section1 Running the examples
 
 You can find many simple examples in the \c examples/declarative
@@ -56,17 +53,17 @@ sub-directory that show how to use various aspects of QML. In addition, the
 applications. These demos are intended to show integrated functionality
 rather than being instructive on specific elements.
 
-To run the examples and demos, you can use Qt Creator or the included \l {Qt Declarative UI Runtime}{qml}
+To run the examples and demos, you can use Qt Creator or the included \l {Qt Declarative UI Runtime}{qmlviewer}
 command-line application. It has some useful options, revealed by:
 
 \code
-    bin/qml -help
+    bin/qmlviewer -help
 \endcode
 
 For example, from your build directory, run:
 
 \code
-    bin/qml $QTDIR/demos/declarative/samegame/samegame.qml
+    bin/qmlviewer $QTDIR/demos/declarative/samegame/samegame.qml
 \endcode
 
 \section1 Examples