Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

4 files changed, 6 insertions, 9 deletions

diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc
index b59384c..19921c0 100644
--- a/doc/src/declarative/tutorial.qdoc
+++ b/doc/src/declarative/tutorial.qdoc
@@ -15,9 +15,9 @@ The tutorial's source code is located in the $QTDIR/examples/declarative/tutoria
 Tutorial chapters:
 
 \list
-\o \l {tutorial1}{Tutorial 1 - Basic Types}
-\o \l {tutorial2}{Tutorial 2 - QML Component}
-\o \l {tutorial3}{Tutorial 3 - States and Transitions}
+\o \l {Tutorial 1 - Basic Types}
+\o \l {Tutorial 2 - QML Component}
+\o \l {Tutorial 3 - States and Transitions}
 \endlist
 
 */
diff --git a/doc/src/declarative/tutorial1.qdoc b/doc/src/declarative/tutorial1.qdoc
index ad454f2..f7e44b0 100644
--- a/doc/src/declarative/tutorial1.qdoc
+++ b/doc/src/declarative/tutorial1.qdoc
@@ -1,6 +1,5 @@
 /*!
 \page tutorial1.html
-\target tutorial1
 \title Tutorial 1 - Basic Types
 
 This first program is a very simple "Hello world" example that introduces some basic QML concepts.
@@ -52,6 +51,6 @@ For example, to run the provided completed Tutorial 1 example from the install l
 bin/qmlviewer $QTDIR/examples/declarative/tutorials/helloworld/tutorial1.qml
 \endcode
 
-[\l tutorial] [Next: \l tutorial2]
+[\l {Tutorial}] [Next: \l {Tutorial 2 - QML Component}]
 
 */
diff --git a/doc/src/declarative/tutorial2.qdoc b/doc/src/declarative/tutorial2.qdoc
index 796d0f9..ac63d9b 100644
--- a/doc/src/declarative/tutorial2.qdoc
+++ b/doc/src/declarative/tutorial2.qdoc
@@ -1,6 +1,5 @@
 /*!
 \page tutorial2.html
-\target tutorial2
 \title Tutorial 2 - QML Component
 
 This chapter adds a color picker to change the color of the text.
@@ -65,7 +64,7 @@ We create the color picker by putting 6 cells with different colors in a grid.
 When the \e clicked signal of our cell is triggered, we want to set the color of the text to the color passed as a parameter.
 We can react to any signal of our component through a property of the name \e 'onSignalName' (see \l{Signal Handlers}).
 
-[Previous: \l tutorial1] [Next: \l tutorial3]
+[Previous: \l {Tutorial 1 - Basic Types}] [Next: \l {Tutorial 3 - States and Transitions}]
 
 */
 
diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc
index 8ef32d4..1e67eee 100644
--- a/doc/src/declarative/tutorial3.qdoc
+++ b/doc/src/declarative/tutorial3.qdoc
@@ -1,6 +1,5 @@
 /*!
 \page tutorial3.html
-\target tutorial3
 \title Tutorial 3 - States and Transitions
 
 In this chapter, we make this example a little bit more dynamic by introducing states and transitions.
@@ -41,6 +40,6 @@ We could also run them one after the other by using \l SequentialAnimation inste
 
 For more details on states and transitions, see \l {states-transitions}{States and Transitions}.
 
-[Previous: \l tutorial2] [\l tutorial]
+[Previous: \l {Tutorial 2 - QML Component}] [\l {Tutorial}]
 
 */