4 files changed, 54 insertions, 55 deletions
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 0ae4f7d..8c096da 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -177,7 +177,7 @@ The guest property declaration looks like this:
 
 \snippet examples/declarative/extending/properties/birthdayparty.h 2
 
-\l {Extending QML in C++ - Object and List Property Types Example} shows the complete
+\l {Extending QML - Object and List Property Types Example} shows the complete
 code used to create the \c BirthdayParty type.
 
 \section1 Inheritance and Coercion
@@ -224,7 +224,7 @@ QML will automatically coerce C++ types when assigning to either an object
 property, or to a list property.  Only if coercion fails does an assignment
 error occur.
 
-\l {Extending QML in C++ - Inheritance and Coercion Example} shows the complete
+\l {Extending QML - Inheritance and Coercion Example} shows the complete
 code used to create the \c Boy and \c Girl types.
 
 \section1 Default Property
@@ -256,7 +256,7 @@ refer to a property declared in the class itself, or a property inherited from a
 base class.
 \endquotation
 
-\l {Extending QML in C++ - Default Property Example} shows the complete code used to
+\l {Extending QML - Default Property Example} shows the complete code used to
 specify a default property.
 
 \section1 Grouped Properties
@@ -281,7 +281,7 @@ property block - in this case the size, color, brand and price properties.
 
 Grouped property blocks may declared and accessed be recusively.
 
-\l {Extending QML in C++ - Grouped Properties Example} shows the complete code used to
+\l {Extending QML - Grouped Properties Example} shows the complete code used to
 implement the \c shoe property grouping.
 
 \section1 Attached Properties
@@ -373,7 +373,7 @@ creating it if it does not already exist.  If \a create is false, the attachment
 object will only be returned if it has previously been created.
 \endquotation
 
-\l {Extending QML in C++ - Attached Properties Example} shows the complete code used to
+\l {Extending QML - Attached Properties Example} shows the complete code used to
 implement the rsvp attached property.
 
 \section1 Memory Management and QVariant types
@@ -435,7 +435,7 @@ listed in \l {Adding Types}, as well registered object types are permitted as
 signal parameter types.  Using other types is not an error, but the parameter
 value will not be accessible from script.
 
-\l {Extending QML in C++ - Signal Support Example} shows the complete code used to
+\l {Extending QML - Signal Support Example} shows the complete code used to
 implement the onPartyStarted signal property.
 
 \section1 Property Value Sources
@@ -482,7 +482,7 @@ to assign it normally, as though it were a regular QML type.  Only if this
 assignment fails does the engine call the setTarget() method.  This allows
 the type to also be used in contexts other than just as a value source.
 
-\l {Extending QML in C++ -  Property Value Source Example} shows the complete code used
+\l {Extending QML -  Property Value Source Example} shows the complete code used
 implement the HappyBirthday property value source.
 
 \section1 Property Binding
@@ -554,7 +554,7 @@ The CONSTANT attribute should only be used for properties whose value is set,
 and finalized, only in the class constructor.  All other properties that want
 to be used in bindings should have a NOTIFY signal instead.
 
-\l {Extending QML in C++ -  Binding Example} shows the BirthdayParty example updated to
+\l {Extending QML -  Binding Example} shows the BirthdayParty example updated to
 include NOTIFY signals for use in binding.
 
 \section1 Extension Objects
diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index c685d3d..165a735 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -103,13 +103,13 @@ and that this approach allows you to integrate new items written in QML
 without using the above method.
 
 You can make custom C++ types 
-available in QML using the pair of macros listed in \l{Extending QML}.
+available in QML using the pair of macros listed in \l{Extending QML in C++}.
 While this is normally only useful for
 types that were designed for QML use, in conjunction with the
 \l{GraphicsObjectContainer} element QGraphicsWidget subclasses can also be
 used effectively (if they were designed, like QGraphicsWidget, to be controllable through Qt's property system).
 This way you can write your UI using QML, without having to rewrite your existing items.
 
-For details on implementing this approach see \l{Extending QML} page for details on exposing your C++ types,
+For details on implementing this approach see \l{Extending QML in C++} page for details on exposing your C++ types,
 and the \l{GraphicsObjectContainer} documentation for details about using it to wrap QGraphicsWidgets. 
 */
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index b43d0ec..8013b92 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -40,76 +40,75 @@
 ****************************************************************************/
 
 /*!
-\module QtDeclarative
-\title QtDeclarative Module
-\ingroup modules
+  \module QtDeclarative
+  \title QtDeclarative Module
+  \ingroup modules
 
-\brief The Qt Declarative module provides a declarative framework for building
-highly dynamic, custom user interfaces.
+  \brief The Qt Declarative module provides a declarative framework
+  for building highly dynamic, custom user interfaces.
 
-To include the definitions of the module's classes, use the
-following directive:
+  To include the definitions of the module's classes, use the
+  following directive:
 
-\code
-#include <QtDeclarative>
-\endcode
+  \code
+  #include <QtDeclarative>
+  \endcode
 
-To link against the module, add this line to your \l qmake \c
-.pro file:
+  To link against the module, add this line to your \l qmake \c
+  .pro file:
 
-\code
-QT += declarative
-\endcode
-
-For more information on the Qt Declarative module, see the
-\l{declarativeui.html}{Declarative UI} documentation.
+  \code
+  QT += declarative
+  \endcode
 
+  For more information on the Qt Declarative module, see the
+  \l{declarativeui.html}{Declarative UI} documentation.
 */
 
 
 /*!
-    \macro QML_DECLARE_TYPE(T)
-    \relates QDeclarativeEngine
-
-    yada yada yada
-
+  \macro QML_DECLARE_TYPE()
+  \relates QDeclarativeEngine
 */
 
 
 /*!
-    \fn int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
-    \relates QDeclarativeEngine
+  \fn int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
+  \relates QDeclarativeEngine
 
-    This template function registers the C++ type \a T with the QML system, and make it available in
-    QML under the name \a qmlName in the import library \a uri version \a versionMajor.versionMajor.
+  This template function registers the C++ type in the QML system with
+  the name \a qmlName. in the library imported from \a uri having the
+  version number composed from \a versionMajor and \a versionMinor.
 
-    Returns the QML type id.
+  Returns the QML type id.
 
-    Example: Register the C++ class \c MinehuntGame as QML type \c Game version 0.1 in the import
-    library \c MinehuntCore:
+  Example: Register the C++ class \c MinehuntGame as the QML type
+  named \c Game for version 0.1 in the import library \c MinehuntCore:
 
-    \code
-        qmlRegisterType<MinehuntGame>("MinehuntCore", 0, 1, "Game");
-    \endcode
+  \code
+  qmlRegisterType<MinehuntGame>("MinehuntCore", 0, 1, "Game");
+  \endcode
 
 */
 
 /*!
-    \fn int qmlRegisterType()
-    \relates QDeclarativeEngine
-    \overload
+  \fn int qmlRegisterType()
+  \relates QDeclarativeEngine
+  \overload
 
-    This template function registers the C++ type \a T with the QML system. Instances of this type cannot
-    be created from the QML system.
+  This template function registers the C++ type in the QML
+  system. Instances of this type cannot be created from the QML
+  system.
 
-    Returns the QML type id.
+  Returns the QML type id.
 */
 
-/*! \fn int qmlRegisterInterface(const char *typeName)
-    \relates QDeclarativeEngine
+/*!
+  \fn int qmlRegisterInterface(const char *typeName)
+  \relates QDeclarativeEngine
 
-    This template function registers the C++ type \a T as interface with the QML system, under the name
-    \a typeName.
+  This template function registers the C++ type in the QML system
+  under the name \a typeName.
 
-    Returns the QML type id.
+  Returns the QML type id.
   */
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index ca1d596..05ffeb0 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -65,7 +65,7 @@ QML provides direct access to the following concepts from Qt:
  \o Qt models - used directly in data binding (QAbstractItemModel and next generation QListModelInterface)
 \endlist
 
-Qt knowledge is \e required for \l {Extending QML}, and also for \l{Integrating QML with existing Qt UI code}.
+Qt knowledge is \e required for \l {Extending QML in C++}, and also for \l{Integrating QML with existing Qt UI code}.
 
 \section1 QML Items compared with QWidgets