Shuffled navigation and modified next/previous links.

Task-number: QTBUG-16071

8 files changed, 18 insertions, 41 deletions

diff --git a/doc/src/declarative/basicelements.qdoc b/doc/src/declarative/basicelements.qdoc
index ad53ea4..c0df307 100644
--- a/doc/src/declarative/basicelements.qdoc
+++ b/doc/src/declarative/basicelements.qdoc
@@ -29,7 +29,7 @@
 \page qmlbasicelements.html
 \ingroup qml-features
 \contentspage QML Features
-\previouspage QML Syntax
+\previouspage QML Features
 \nextpage {QML Basic Types}{Data Types}
 
 \title QML Basic Elements
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index aa4006b..53c7da3 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -75,15 +75,15 @@ QML and the Qt Declarative Module separate the frontend UI logic from the backen
 \section1 QML Features
 
 \list
-\o \l{QML Syntax}
-\o \l{Property Binding}
-\o \l{QML Basic Types}{Data Types}
 \o \l{QML Basic Elements}{Basic Elements}
+\o \l{QML Basic Types}{Data Types}
+\o \l{Property Binding}
 \o \l{Using QML Positioner and Repeater Items}{Component Layouts}
 \o \l{Anchor-based Layout in QML}{Layouts using Anchors}
 \o \l{QML Mouse Events}{Mouse Events}
 \o \l{QML Text Handling and Validators}{Text Handling and Validators}
 \o \l{Keyboard Focus in QML}{Keyboard Focus}
+\o \l{QML Signal and Handler Event System}{Signal and Handler Event System}
 \o \l{Importing Reusable Components}
 \o \l{QML States}{States}
 \o \l{QML Animation and Transitions}{Animation and Transitions}
@@ -92,11 +92,9 @@ QML and the Qt Declarative Module separate the frontend UI logic from the backen
 \o \l{Extending QML Functionalities using C++}
 \o \l{Using QML Bindings in C++ Applications}
 \o \l{Integrating QML Code with Existing Qt UI Code}
-\o \l{QML Signal and Handler Event System}{Signal and Handler Event System}
 \o \l{Dynamic Object Management in QML}{Dynamic Object Management}
 \o \l{Network Transparency}{Loading Resources in QML}
 \o \l{QML Internationalization}{Internationalization}
-\o \l{QML Graphical Effects}{Graphical Effects}
 \endlist
 
 \section1 QML Add-Ons
diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index 055f437..a8339e0 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -29,7 +29,7 @@
 \page qdeclarativedynamicobjects.html
 \ingroup qml-features
 \contentspage {QML Features}
-\previouspage {QML Signal and Handler Event System}{Signal and Handler Event System}
+\previouspage {Integrating QML Code with Existing Qt UI Code}
 \nextpage {Network Transparency}{Loading Resources in QML}
 \title Dynamic Object Management in QML
 
@@ -66,14 +66,14 @@ To dynamically load a component defined in a QML file, call the
 This function takes the URL of the QML file as its only argument and creates
 a \l Component object from this URL.
 
-Once you have a \l Component, you can call its \l {Component::createObject()}{createObject()} method to create an instance of 
+Once you have a \l Component, you can call its \l {Component::createObject()}{createObject()} method to create an instance of
 the component. This function can take one or two arguments:
 \list
-\o The first is the parent for the new item. Since graphical items will not appear on the scene without a parent, it is 
-  recommended that you set the parent this way. However, if you wish to set the parent later you can safely pass \c null to 
-  this function. 
-\o The second is optional and is a script which assigns values to the item's properties during creation. This avoids warnings 
-  when certain properties have been bound to before they have been set by the code. Additionally, there are small performance 
+\o The first is the parent for the new item. Since graphical items will not appear on the scene without a parent, it is
+  recommended that you set the parent this way. However, if you wish to set the parent later you can safely pass \c null to
+  this function.
+\o The second is optional and is a script which assigns values to the item's properties during creation. This avoids warnings
+  when certain properties have been bound to before they have been set by the code. Additionally, there are small performance
   benefits when instantiating objects in this way.
 \endlist
 
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index 9a11491..940f864 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -31,7 +31,7 @@
 \ingroup qml-features
 \contentspage QML Features
 \previouspage {QML Text Handling and Validators}{Text Handling and Validators}
-\nextpage {Importing Reusable Components}
+\nextpage {QML Signal and Handler Event System}{Signal and Handler Event System}
 
 \title Keyboard Focus in QML
 
diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index 649088d..c2f55f5 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -29,7 +29,7 @@
 \page qml-integration.html
 \ingroup qml-features
 \previouspage {Using QML Bindings in C++ Applications}
-\nextpage {QML Signal and Handler Event System}
+\nextpage {Dynamic Object Management in QML}{Dynamic Object Management}
 \contentspage QML Features
 \title Integrating QML Code with Existing Qt UI Code
 
diff --git a/doc/src/declarative/qdeclarativei18n.qdoc b/doc/src/declarative/qdeclarativei18n.qdoc
index 756ef4b..3d97113 100644
--- a/doc/src/declarative/qdeclarativei18n.qdoc
+++ b/doc/src/declarative/qdeclarativei18n.qdoc
@@ -30,7 +30,7 @@
 \ingroup qml-features
 \contentspage QML Features
 \previouspage {Network Transparency}{Loading Resources in QML}
-\nextpage {QML Graphical Effects}{Graphical Effects}
+\nextpage {QML Features}
 \title QML Internationalization
 
 \section1 Overview
diff --git a/doc/src/declarative/qmlreusablecomponents.qdoc b/doc/src/declarative/qmlreusablecomponents.qdoc
index 956fa24..e6c3ec9 100644
--- a/doc/src/declarative/qmlreusablecomponents.qdoc
+++ b/doc/src/declarative/qmlreusablecomponents.qdoc
@@ -28,7 +28,7 @@
 /*!
 \page qmlreusablecomponents.html
 \ingroup qml-features
-\previouspage {Keyboard Focus in QML}{Keyboard Focus}
+\previouspage {QML Signal and Handler Event System}{Signal and Handler Event System}
 \nextpage {QML States}{States}
 \contentspage QML Features
 
@@ -141,22 +141,3 @@ to be exposed.
 \snippet doc/src/snippets/declarative/reusablecomponents/focusbutton.qml document
 */
 
-The root object in \c Button.qml defines the attributes that are available to users of the
-\c Button component. In this case, the root object is a \l Rectangle, so any properties, methods
-and signals of \l Rectangle are made available, allowing \c application.qml to
-customize the \c width, \c height, \c radius and \c color properties of \c Button objects.
-
-If \c Button.qml was not in the same directory, \c application.qml would need to load it as a
-\l {Modules}{module} from a specific filesystem path or \l{QDeclarativeExtensionPlugin}{plugin}.
-Also, note the letter case of the component file name is significant on some (notably UNIX)
-filesystems. It is recommended the file name case matches the case of the QML component name
-exactly - for example, \c Box.qml and not \c BoX.qml - regardless of the platform to which the
-QML component will be deployed.
-
-\snippet doc/src/snippets/declarative/qml-extending-types/components/Button.qml 0
-\table
-\row
-\o \snippet doc/src/snippets/declarative/qml-extending-types/components/application.qml 0
-\o \image qml-extending-types.png
-\endtable
-
diff --git a/doc/src/declarative/qmlsyntax.qdoc b/doc/src/declarative/qmlsyntax.qdoc
index 67d282a..fc25bce 100644
--- a/doc/src/declarative/qmlsyntax.qdoc
+++ b/doc/src/declarative/qmlsyntax.qdoc
@@ -28,10 +28,8 @@
 /*!
 \page qmlsyntax.html
 \title QML Syntax
-\ingroup QML Features
-\previouspage QML Features
-\nextpage QML Basic Elements
-\contentspage QML Features
+\ingroup QML Reference
+\contentspage QML Reference
 
 \tableofcontents
 
@@ -67,7 +65,7 @@ types always begin with a capital letter. In the above example, there are
 two objects, a \l Rectangle, and an \l Image. Between the braces, we can specify
 information about the object, such as its properties.
 
-Properties are specified as \c {property: value}. In the above example, we
+Properties are specified as \c {propertyname: value}. In the above example, we
 can see the Image has a property named \c source, which has been assigned the
 value \c "pics/logo.png". The property and its value are separated by a colon.