Fix various broken links in documentation

Change-Id: I9e2dac37d18e3ca62e4a92be25e5c2e60ffeba00
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>

11 files changed, 17 insertions, 17 deletions

diff --git a/src/quick/doc/src/appdevguide/deployment.qdoc b/src/quick/doc/src/appdevguide/deployment.qdoc
index 2104bb6552..916483a0d9 100644
--- a/src/quick/doc/src/appdevguide/deployment.qdoc
+++ b/src/quick/doc/src/appdevguide/deployment.qdoc
@@ -128,7 +128,7 @@ loaded as a QQmlComponent instance rather than placed into a view:
     }
 \endcode
 
-See \l{qtqml-cppintegration-data.html}{Exposing C++ Data to QML} for more information about using
+See \l{qtqml-cppintegration-data.html}{qtqml-cppintegration-exposecppattributes.html}{Exposing Attributes of C++ Types to QML} for more information about using
 QQmlEngine, QQmlContext and QQmlComponent, as well
 as details on including QML files through \l{The Qt Resource System}{Qt's Resource system}.
 
diff --git a/src/quick/doc/src/appdevguide/glossary.qdoc b/src/quick/doc/src/appdevguide/glossary.qdoc
index 65b9b3374d..a3b6db8a14 100644
--- a/src/quick/doc/src/appdevguide/glossary.qdoc
+++ b/src/quick/doc/src/appdevguide/glossary.qdoc
@@ -159,7 +159,7 @@
         \li Signal
         \li A signal is a notification from a QML object. When an object emits
             a signal, other objects can receive and process this signal through
-            a \l{qtqml-syntax-objectattributes.html#signal-handlers}{signal handler}.
+            a \l{Signal Attributes}{signal handler}.
 
             Most properties of QML objects
             have a change signal, and also an associated change signal handler
diff --git a/src/quick/doc/src/appdevguide/porting.qdoc b/src/quick/doc/src/appdevguide/porting.qdoc
index eb1bb63db9..f4937fa658 100644
--- a/src/quick/doc/src/appdevguide/porting.qdoc
+++ b/src/quick/doc/src/appdevguide/porting.qdoc
@@ -67,7 +67,7 @@ Qt.inputMethod.hide() to show and hide the virtual keyboard.
 XmlListModel and XmlRole types must import \e {QtQuick.XmlListModel} instead.
 \li The local storage API that enables SQL support has been moved from the \l {QML Global Object}
 into a \c QtQuick.LocalStorage module API. Any code that requires the local storage API must import
-\e {QtQuick.LocalStorage} with a namespaced import instead. See the \l LocalStorage documentation
+\e {QtQuick.LocalStorage} with a namespaced import instead. See the \l \l{QtQuick.LocalStorage 2}{QtQuick.LocalStorage} documentation
 for examples.
 \li The \c LayoutItem type has been removed from the \c QtQuick module as it was specific to the
 Graphics View framework backend used in QtQuick 1.
diff --git a/src/quick/doc/src/appdevguide/quickstart/components.qdoc b/src/quick/doc/src/appdevguide/quickstart/components.qdoc
index b11f849a75..989eefad09 100644
--- a/src/quick/doc/src/appdevguide/quickstart/components.qdoc
+++ b/src/quick/doc/src/appdevguide/quickstart/components.qdoc
@@ -211,7 +211,7 @@ arrays. See the \l {list}{list type documentation} for details.
 
 Adding a \c property to an item automatically adds a \e {value changed}
 signal handler to the item. To connect to this signal, use a
-\l{qtqml-syntax-objectattributes.html#signal-handlers}{signal handler}
+\l{Signal Attributes}{signal handler}
 named with the \c on<Property>Changed syntax, using upper case for the first letter of the
 property name.
 
@@ -431,7 +431,7 @@ performAction signal above; the allowed parameter types are the same as those li
 {Adding Properties} section on this page.
 
 Adding a signal to an item automatically adds a
-\l{qtqml-syntax-objectattributes.html#signal-handlers}{signal handler} as well.
+\l{Signal Attributes}{signal handler} as well.
 The signal hander is named \c on<SignalName>, with the first letter of the signal being upper
 cased. The above example item would now have the following signal handlers:
 
@@ -467,7 +467,7 @@ Signal objects have a \c connect() method that can be used to a connect a signal
 another signal. When a signal is connected to a method, the method is automatically invoked
 whenever the signal is emitted. (In Qt terminology, the method is a \e slot that is connected
 to the \e signal; all methods defined in QML are created as Qt slots.) This enables a signal
-to be received by a method instead of a \l{qtqml-syntax-objectattributes.html#signal-handlers}
+to be received by a method instead of a \l{Signal Attributes}
 {signal handler}.
 
 For example, the \c application.qml above could be rewritten as:
diff --git a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
index d2c0307d03..c02a583e7d 100644
--- a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
+++ b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
@@ -187,7 +187,7 @@ To visualize data, bind the view's \c model property to a model and the
 
     QML provides several types of data models among the built-in set of QML
     elements. In addition, models can be created with Qt C++ and then made
-    available to the \l{qtqml-cppclasses-engine.html}{QML engine} for use by
+    available to the \l{QQmlEngine}{QMLEngine} for use by
     QML components. For information about creating these models, visit the
     \l{qtquick-modelviewsdata-cppmodels.html}{Using C++ Models with QtQuick Views}
     and \l{qtqml-typesystem-topic.html#qml-object-types}
@@ -358,7 +358,7 @@ rectangles for the Grid item to position in a 5 by 5 arrangement.
 The number of items created by a Repeater is held by its \l{Repeater::}{count}
 property. It is not possible to set this property to determine the number of
 items to be created. Instead, as in the above example, we use an integer as
-the model. This is explained in the \l{QML Data Models#An Integer}{QML Data Models}
+the model. This is explained in the \l{qtquick-modelviewsdata-modelview.html#integers-as-models}{QML Data Models}
 document.
 
 It is also possible to use a delegate as the template for the items created
diff --git a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
index cc8add1286..53febb506f 100644
--- a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
+++ b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
@@ -91,7 +91,7 @@ views that takes the mirroring into account can be read from the \c effectiveLay
 The attached property \l LayoutMirroring is provided as a convenience for easily implementing right-to-left
 support for existing left-to-right Qt Quick applications. It mirrors the behavior of \l {anchor-layout}
 {Item anchors}, the layout direction of \l{Composing User Interfaces with QML#Positioners}{positioners} and
-\l{qtquick-concepts-data-modelview.html}{model views}, and the explicit text alignment of QML text elements.
+\l{qtquick-modelviewsdata-modelview.html}{model views}, and the explicit text alignment of QML text elements.
 
 You can enable layout mirroring for a particular \l Item:
 
diff --git a/src/quick/doc/src/concepts/statesanimations/animations.qdoc b/src/quick/doc/src/concepts/statesanimations/animations.qdoc
index cb607fe563..65e3a01589 100644
--- a/src/quick/doc/src/concepts/statesanimations/animations.qdoc
+++ b/src/quick/doc/src/concepts/statesanimations/animations.qdoc
@@ -28,7 +28,7 @@
 /*!
 \ingroup qtquick-transitions-animations
 \page qtquick-statesanimations-animations.html
-\title Animation and Transitions In Qt Quick
+\title Animation and Transitions in Qt Quick
 \brief the animation system in Qt Quick
 
 \section1 Animation and Transitions Elements
@@ -94,7 +94,7 @@ information about the different animation properties.
 \keyword qml-transition-animations
 \section2 Transitions during State Changes
 
-\l{State}{States} are property configurations where a property may have different values to reflect different states. State changes introduce
+\l{State}{Qt Quick States} are property configurations where a property may have different values to reflect different states. State changes introduce
 abrupt property changes; animations smooth transitions to produce visually
 appealing state changes.
 
diff --git a/src/quick/doc/src/concepts/statesanimations/states.qdoc b/src/quick/doc/src/concepts/statesanimations/states.qdoc
index 095a3cb883..a7a1282ba5 100644
--- a/src/quick/doc/src/concepts/statesanimations/states.qdoc
+++ b/src/quick/doc/src/concepts/statesanimations/states.qdoc
@@ -125,7 +125,7 @@ The \l {declarative/animation/states}{States and Transitions example}
 demonstrates how to declare a basic set of states and apply animated
 transitions between them.
 
-\l{qtquick-statesanimations-behaviors.html}{Using QML Behaviors with States}
+\l{qtquick-statesanimations-behaviors.html}{Using Qt Quick Behaviors with States}
 explains a common problem when using Behaviors to animate state changes.
 
 \section1 State Fast Forwarding
diff --git a/src/quick/doc/src/concepts/statesanimations/topic.qdoc b/src/quick/doc/src/concepts/statesanimations/topic.qdoc
index 25b0958162..f4c5e89480 100644
--- a/src/quick/doc/src/concepts/statesanimations/topic.qdoc
+++ b/src/quick/doc/src/concepts/statesanimations/topic.qdoc
@@ -27,7 +27,7 @@
 
 /*!
 \page qtquick-statesanimations-topic.html
-\title Concepts - States And Animations
+\title Import Concepts in Qt Quick - States, Transitions and Animations
 \brief Description of the concepts of states, transitions and animations in Qt Quick
 
 In any modern user-interface, transitioning between states and animating
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index 6920fffb71..1db07cec47 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -45,7 +45,7 @@ imported via the following statement:
 import QtQuick 2.0
 \endqml
 
-See the \l{qtquick-main.html}{Qt Quick} module documentation for more
+See the \l{qtquick-main.html}{QtQuick} module documentation for more
 information about the concepts which are central to \c QtQuick.
 
 \section1 Basic Types
@@ -231,7 +231,7 @@ Views
 
 Data Storage
 \list
-\li \l {LocalStorage} - Module API providing simplified SQL access
+\li \l {QtQuick.LocalStorage 2} - Module API providing simplified SQL access
 \endlist
 
 \section2 Graphical Effects
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index 8fa21cee53..7c7715021b 100644
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -80,11 +80,11 @@ To find out more about using the QML language, see the \l{Qt QML Module Document
         \li \l{qtquick-qmltypereference.html#object-types}{Object Types}
             \list
             \li \l{qtquick-qmltypereference.html#visual-types}{Visual Types}
-            \li \l{qtquick-qmltypereference.html#user-input-types}{User Input Types}
+            \li \l{qtquick-qmltypereference.html#user-input}{User Input}
             \li \l{qtquick-qmltypereference.html#positioning}{Positioning}
             \li \l{qtquick-qmltypereference.html#states-transitions-and-animations}{States, Transitions And Animations}
             \li \l{qtquick-qmltypereference.html#model-view-types-and-data-storage-and-access}{Model/View Types And Data Storage And Access}
-            \li \l{qtquick-qmltypereference.html#particles-and-graphical-effects}{Particles And Graphical Effects}
+            \li \l{qtquick-qmltypereference.html#graphical-effects}{Graphical Effects}
             \li \l{qtquick-qmltypereference.html#convenience-types}{Convenience Types}
             \li \l{qtquick-qmltypereference.html#canvas-similar-to-html5-canvas}{Canvas (similar to HTML5 Canvas)}
             \endlist