Fix various broken links in documentation

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

20 files changed, 52 insertions, 56 deletions

diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index bdfb6fa235..39168bfa49 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -346,8 +346,8 @@ within the same class, or that the enumeration value is one of those declared
 in the \l {Qt}{Qt Namespace}.
 
 Additionally, if a C++ signal with an enum parameter should be connectable to a
-QML function using the \l{QML Signal and Handler Event System#Connecting Signals
-to Methods and Signals}{connect()} function, the enum type must be registered
+QML function using the \l{qtqml-syntax-signals.html#connecting-signals-to-methods-and-signals}
+{connect()} function, the enum type must be registered
 using qRegisterMetaType().
 
 For QML signals, enum values may be passed as signal parameters using the \c int
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc
index 140ab6a197..969261a972 100644
--- a/src/qml/doc/src/cppintegration/definetypes.qdoc
+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc
@@ -395,7 +395,7 @@ board context, they could be implemented as \e attached attributes on a
 terms of the concepts described earlier, the parties involved here are:
 
 \list
-\li An instance of an anonymous \l{attached object type}, which provides a
+\li An instance of an anonymous \e{attached object type}, which provides a
     \c published signal and an expired property. This type is implemented by
     \c MessageBoardAttachedType below
 \li A \c Message object, which will be the \e attachee
@@ -614,7 +614,7 @@ MessageBoard {
 \endqml
 
 (Incidentally, the \l Item::children property is its default property, which
-enables visual children to be conveniently declared for any \l Item-based
+enables visual children to be conveniently declared for any \l {Item}-based
 type without explicitly assigning them to this property.)
 
 A default property is optional. A derived class inherits its base class's
diff --git a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
index 51e92b2857..a7cc977cbd 100644
--- a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
+++ b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
@@ -87,8 +87,8 @@ compile-time safety. In this case the base object of \c MyItem.qml is an
 \snippet qml/qtbinding/loading/main.cpp cast
 
 You can also connect to any signals or call methods defined in the component
-using QMetaObject::invokeMethod() and QObject::connect(). See \l {Exchanging
-data between QML and C++} below for further details.
+using QMetaObject::invokeMethod() and QObject::connect(). See \l {Invoking QML Methods}
+and \l {Connecting to QML Signals} below for further details.
 
 
 \section1 Accessing Loaded QML Objects by Object Name
@@ -159,7 +159,7 @@ System}{meta-object system} and the QML engine is not made aware of the
 property change. This means property bindings to \c buttonText would not be
 updated, and any \c onButtonTextChanged handlers would not be called.
 
-\section2 Methods
+\section2 Invoking QML Methods
 
 All QML methods are exposed to the meta-object system and can be called from C++
 using QMetaObject::invokeMethod(). Method parameters and return values passed
@@ -179,12 +179,12 @@ must be specified as QVariant types, as this is the generic data type used for
 QML method parameters and return values.
 
 
-\section2 Signals And Slots
+\section2 Connecting to QML Signals
 
 All QML signals are automatically available to C++, and can be connected to
 using QObject::connect() like any ordinary Qt C++ signal. In return, any C++
 signal can be received by a QML object using
-\l {Signal Handlers}{signal handlers}.
+\l {qtqml-syntax-signals.html}{signal handlers}.
 
 Here is a QML component with a signal named \c qmlSignal that is emitted with
 a string-type parameter. This signal is connected to a C++ object's slot using
@@ -256,4 +256,4 @@ QVariant type:
 \endcode
 \endtable
 
-*/
\ No newline at end of file
+*/
diff --git a/src/qml/doc/src/documents/definetypes.qdoc b/src/qml/doc/src/documents/definetypes.qdoc
index ec1750e840..d243afb1c9 100644
--- a/src/qml/doc/src/documents/definetypes.qdoc
+++ b/src/qml/doc/src/documents/definetypes.qdoc
@@ -95,7 +95,7 @@ Column {
 
 \image documents-definetypes-attributes.png
 
-The attributes that are accessible to objects of the custom QML type include any \l{Custom properties}{custom properties}, \l{Custom methods}{methods} and \l{Custom signals}{signals} that have additionally been defined for an object. For example, suppose the \l Rectangle in \c SquareButton.qml had been defined as follows, with additional properties, methods and signals:
+The attributes that are accessible to objects of the custom QML type include any \l{Defining Property Attributes}{custom properties}, \l{Defining Method Attributes}{methods} and \l{Defining Signal Attributes}{signals} that have additionally been defined for an object. For example, suppose the \l Rectangle in \c SquareButton.qml had been defined as follows, with additional properties, methods and signals:
 
 \qml
 // SquareButton.qml
diff --git a/src/qml/doc/src/javascript/expressions.qdoc b/src/qml/doc/src/javascript/expressions.qdoc
index 130be84b0b..3c8f83d22b 100644
--- a/src/qml/doc/src/javascript/expressions.qdoc
+++ b/src/qml/doc/src/javascript/expressions.qdoc
@@ -58,17 +58,17 @@ QML \l{QML Object Types}{object types} defined in \l{QML Documents}
 logic.  There are four ways that JavaScript can be used in a QML document:
 
 \list
-  \li \l{QML Object Attributes#property-initialization}{properties} can be
+  \li \l{Property Attributes}{properties} can be
       assigned \l{Property Binding}{bindings} which are defined with
       JavaScript expressions, and which are automatically evaluated by the
       \l{QQmlEngine}{QML engine} when any properties accessed in the binding
       change, in order to ensure always-up-to-date property values.  Binding
       expressions can also perform function evaluation as an explicit side
       effect
-  \li \l{QML Object Attributes#signal-handlers}{signal handlers} can be defined
+  \li \l{Signal Attributes}{signal handlers} can be defined
       which are automatically evaluated when the object emits the associated
       signal
-  \li \l{QML Object Attributes#custom-methods}{custom methods} can be defined
+  \li \l{Method Attributes}{custom methods} can be defined
       in QML files as JavaScript functions
   \li JavaScript files providing functions and variables can be
       \l{Importing JavaScript Files in QML Documents}{imported} in a QML
@@ -244,9 +244,8 @@ Non-trivial program logic is best separated into external JavaScript files.
 These files can be imported into QML files using an \c import statement, in
 the same way that \l {QML Modules}{modules} are imported.
 
-For example, the \c {factorial()} method in the above example for
-\l{JavaScript Expressions in Custom Methods} could be moved into an external
-file named \c factorial.js, and accessed like this:
+For example, the \c {factorial()} method in the above example could be moved
+into an external file named \c factorial.js, and accessed like this:
 
 \qml
 import "factorial.js" as MathFunctions
@@ -260,7 +259,7 @@ Item {
 \endqml
 
 For more information about loading external JavaScript files into QML, read
-the section about \l{Importing JavaScript into QML}.
+the section about \l{Importing JavaScript Files in QML Documents}.
 
 
 
@@ -286,7 +285,7 @@ as an argument.  For example, the following code connects the MouseArea
 The \c jsFunction() will now be called whenever MouseArea's \c clicked signal
 is emitted.
 
-See \l{QML Signal and Handler Event System#Connecting Signals to Methods and Signals}
+See \l{qtqml-syntax-signals.html}
 {Connecting Signals to Methods and Signals} for more information.
 
 
@@ -300,7 +299,7 @@ component instance) startup.  While it is tempting to just include the startup
 script as \e {global code} in an external script file, this can have severe
 limitations as the QML environment may not have been fully established.  For
 example, some objects might not have been created or some
-\l {Property Binding}s may not have been run.  \l {QML JavaScript Restrictions}
+\l {Property Binding}s may not have been run.  \l {JavaScript Expression Restrictions in QML}
 covers the exact limitations of global script code.
 
 Every QML object has an \e attached \l Component property that references the
@@ -378,7 +377,7 @@ that includes the file and line number of the offending code.
 During startup, if a QML file includes an external JavaScript file with "global"
 code, it is executed in a scope that contains only the external file itself and
 the global object.  That is, it will not have access to the QML objects and
-properties it \l {QML Scope}{normally would}.
+properties it \l {Scope and Naming Resolution}{normally would}.
 
 Global code that only accesses script local variable is permitted.  This is an
 example of valid global code.
diff --git a/src/qml/doc/src/javascript/functionlist.qdoc b/src/qml/doc/src/javascript/functionlist.qdoc
index e81cd6430a..9dca6c51be 100644
--- a/src/qml/doc/src/javascript/functionlist.qdoc
+++ b/src/qml/doc/src/javascript/functionlist.qdoc
@@ -31,7 +31,7 @@
 
     This reference contains a list of objects, functions and
     properties supported by the \l{QQmlEngine}{QML engine}. For a detailed
-    description, see the \l{External: ECMA-262} specification.
+    description, see the \l{ECMA-262} specification.
 
     \section1 The Global Object
 
diff --git a/src/qml/doc/src/javascript/topic.qdoc b/src/qml/doc/src/javascript/topic.qdoc
index c7d7d2b9ff..19019f0817 100644
--- a/src/qml/doc/src/javascript/topic.qdoc
+++ b/src/qml/doc/src/javascript/topic.qdoc
@@ -39,8 +39,8 @@ JavaScript to quickly develop both user-interfaces and application logic.
 \section1 JavaScript Expressions
 
 QML has a deep JavaScript integration, and allows
-\l{qtqml-syntax-objectattributes.html#signal-handlers}{signal handlers}
-and \l{qtqml-syntax-objectattributes.html#custom-methods}{methods}
+\l{Signal Attributes}{signal handlers}
+and \l{Method Attributes}{methods}
 to be defined in JavaScript.  One of the other fundamental concepts of QML is
 the ability to bind property values to the result of complex expressions which
 can include properties from other objects. These
diff --git a/src/qml/doc/src/modules/cppplugins.qdoc b/src/qml/doc/src/modules/cppplugins.qdoc
index 4887e426aa..fb20c3e8d5 100644
--- a/src/qml/doc/src/modules/cppplugins.qdoc
+++ b/src/qml/doc/src/modules/cppplugins.qdoc
@@ -50,7 +50,7 @@
     \li Register types with qmlRegisterType()
     \li Export the class using the Q_EXPORT_PLUGIN2() macro
     \li Write a project file for the plugin
-    \li Create a \l{Syntax of a qmldir file}{qmldir file} to describe the plugin
+    \li Create a \l{Adding Module Metadata with a qmldir file}{qmldir file} to describe the plugin
     \endlist
 
     QML extension plugins are for either application-specific or library-like
@@ -83,7 +83,7 @@
     The \c TimeModel class receives a \c{1.0} version of this plugin library, as
     a QML type called \c Time. The Q_ASSERT() macro can ensure the module is
     imported correctly by any QML components that use this plugin. The
-    \l{Defining QML Object Types from C++} article has more information about registering C++
+    \l{Defining QML Types from C++} article has more information about registering C++
     types into the runtime.
 
     For this example, the TimeExample source directory is in
@@ -104,7 +104,7 @@
     ...
     \endcode
 
-    Finally, a \l{Syntax of a qmldir file}{qmldir file} is required in the \c
+    Finally, a \l{Adding Module Metadata with a qmldir file}{qmldir file} is required in the \c
     com/nokia/TimeExample directory to specify the plugin. This directory
     includes a \c Clock.qml file that should be bundled with the plugin, so it
     needs to be specified in the \c qmldir file:
@@ -125,7 +125,7 @@
     \list
     \li \l {Tutorial: Extending QML with C++} - contains a chapter
     on creating QML plugins.
-    \li \l{Defining QML Object Types from C++} - information about registering C++ types into
+    \li \l{Defining QML Types from C++} - information about registering C++ types into
     the runtime.
     \li \l{How to Create Qt Plugins} - information about Qt plugins
     \endlist
diff --git a/src/qml/doc/src/modules/installedmodules.qdoc b/src/qml/doc/src/modules/installedmodules.qdoc
index a17b23615f..4440f1bb80 100644
--- a/src/qml/doc/src/modules/installedmodules.qdoc
+++ b/src/qml/doc/src/modules/installedmodules.qdoc
@@ -154,7 +154,7 @@ example:
 
 \snippet examples/qml/cppextensions/plugins/plugin.cpp plugin
 
-Once the plugin is built and installed, and includes a \l{Syntax of a qmldir file}{qmldir file},
+Once the plugin is built and installed, and includes a \l{Adding Module Metadata with a qmldir file}{qmldir file},
 the module can be imported from QML, like this:
 
 \snippet qml/imports/timeexample.qml import
diff --git a/src/qml/doc/src/modules/qmldir.qdoc b/src/qml/doc/src/modules/qmldir.qdoc
index 5c9a4ef506..7e9b8c59b4 100644
--- a/src/qml/doc/src/modules/qmldir.qdoc
+++ b/src/qml/doc/src/modules/qmldir.qdoc
@@ -235,7 +235,7 @@ to \c /tmp/imports/My/Module/qmldir to register it.
 
 While the qmldump tool covers most cases, it does not work if:
 \list
-\li The plugin uses a \l{QQmlCustomParser}. The component that uses
+\li The plugin uses a \c{QQmlCustomParser}. The component that uses
    the custom parser will not get its members documented.
 \li The plugin can not be loaded. In particular if you cross-compiled
    the plugin for a different architecture, qmldump will not be able to
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index c240a02d16..0e23db3bf4 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -70,7 +70,7 @@
 
   The former is the standard form which registers the type \e T as a new type.
   The latter allows a particular revision of a class to be registered in
-  a specified version (see \l {QML Type Versioning}).
+  a specified version (see \l {Type Revisions and Versions}).
 
 
   For example, this registers a C++ class \c MySliderItem as a QML type
@@ -118,7 +118,7 @@
   \endcode
 
   This function is typically used to register the revision of a base class to
-  use for the specified module version (see \l {QML Type Versioning}).
+  use for the specified module version (see \l {Type Revisions and Versions}).
 */
 
 /*!
diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc
index 04f0e48410..4e4c2c546c 100644
--- a/src/qml/doc/src/qmltypereference.qdoc
+++ b/src/qml/doc/src/qmltypereference.qdoc
@@ -59,11 +59,11 @@ and functionality provided by the \c QtQml namespace are also provided by the
 import QtQuick 2.0
 \endqml
 
-See the \l{QtQuick}{Qt Quick} module documentation for more information about the
+See the \l{QtQuick}{QtQuick} module documentation for more information about the
 \c QtQuick namespace and what it provides to QML application developers.
 
 The documentation for the types below applies equally to the types of the same
-name provided by the \l{QtQuick}{Qt Quick} module, as they are in fact identical.
+name provided by the \l{QtQuick}{QtQuick} module, as they are in fact identical.
 
 \section1 Basic Types
 
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc
index 4482822c01..5ec2982cad 100644
--- a/src/qml/doc/src/qtqml.qdoc
+++ b/src/qml/doc/src/qtqml.qdoc
@@ -174,7 +174,7 @@ types, animation classes, and canvas integration) for the QML language.
 \section1 Reference Documentation
 
 More information about the Qt QML module is contained within the class and
-function documentation of the \l{qtqml-apireference.html}
+function documentation of the \l{QtQml}
 {Qt QML Module API Reference}.  The QML types provided by the Qt QML module
 are listed in the \l{qtqml-typereference-topic.html}
 {Qt QML Module QML Type Reference} page.
@@ -189,7 +189,7 @@ application developers will use in their applications.
 Quick Links:
 \list
 \li \l{qtqml-typereference-topic.html}{Qt QML Module QML Type Reference}
-\li \l{qtqml-module.html}{Qt QML Module C++ API Reference}
+\li \l{QtQml}{Qt QML Module C++ API Reference}
 \li \l{qtquick-main.html}{Qt Quick Module Documentation}
 \li \l{qtquick-applicationdevelopers.html}{QML Application Developer Resources}
 \li \l{qtqml-releasenotes.html}{QtQml Release Notes}
diff --git a/src/qml/doc/src/syntax/basics.qdoc b/src/qml/doc/src/syntax/basics.qdoc
index afb0731fb2..786d208653 100644
--- a/src/qml/doc/src/syntax/basics.qdoc
+++ b/src/qml/doc/src/syntax/basics.qdoc
@@ -114,7 +114,7 @@ When placed into a \c .qml file and loaded by the QML engine, the above code cre
 Rectangle { width: 200; height: 200; color: "red" }
 \endqml
 
-Obviously, the \l Rectangle object declared in this example is very simple indeed, as it defines nothing more than a few property values. To create more useful objects, an object declaration may define many other types of attributes: these are discussed in the \l{qtqml-syntax-object-declaration.html}{Object Declarations} documentation. Additionally, an object declaration may define child objects, as discussed below.
+Obviously, the \l Rectangle object declared in this example is very simple indeed, as it defines nothing more than a few property values. To create more useful objects, an object declaration may define many other types of attributes: these are discussed in the \l{qtqml-syntax-objectattributes.html}{QML Object Attributes} documentation. Additionally, an object declaration may define child objects, as discussed below.
 
 
 \section2 Child Objects
diff --git a/src/qml/doc/src/syntax/imports.qdoc b/src/qml/doc/src/syntax/imports.qdoc
index b68c29d99e..3519b3cc2f 100644
--- a/src/qml/doc/src/syntax/imports.qdoc
+++ b/src/qml/doc/src/syntax/imports.qdoc
@@ -153,7 +153,7 @@ The qualifier ("MyScript" in the above example) must be unique within the QML do
 Unlike ordinary modules, multiple scripts cannot be imported into the same namespace.
 
 Javascript files can be provided by modules, by adding Namespace definitions to the
-\l{Syntax of a qmldir file}{qmldir file} for the module.  For example:
+\l{Adding Module Metadata with a qmldir file}{qmldir file} for the module.  For example:
 
 \code
 SystemFunctions 1.0 SystemFunctions.js
diff --git a/src/qml/doc/src/syntax/objectattributes.qdoc b/src/qml/doc/src/syntax/objectattributes.qdoc
index 941d3c6198..ddfe70a425 100644
--- a/src/qml/doc/src/syntax/objectattributes.qdoc
+++ b/src/qml/doc/src/syntax/objectattributes.qdoc
@@ -415,7 +415,7 @@ In some cases properties contain a logical group of sub-property attributes.
 These sub-property attributes can be assigned to using either the dot notation
 or group notation.
 
-For example, the \l Text type has a \l{Text::font}{font} group property. Below,
+For example, the \l Text type has a \l{Text::font.family}{font} group property. Below,
 the first \l Text object initializes its \c font values using dot notation,
 while the second uses group notation:
 
@@ -605,7 +605,7 @@ Item {
 A signal is a notification from an object that some event has occurred: for
 example, a property has changed, an animation has started or stopped, or
 when an image has been downloaded. The \l MouseArea type, for example, has
-a \l {MouseArea::clicked}{clicked} signal that is emitted when the user clicks
+a \l {MouseArea::onClicked}{clicked} signal that is emitted when the user clicks
 within the mouse area.
 
 An object can be notified through a \l{Signal handler attributes}
@@ -666,7 +666,7 @@ Item {
 If the signal has no parameters, the "()" brackets are optional. If parameters
 are used, the parameter types must be declared, as for the \c string and \c var
 arguments for the \c actionPerformed signal above. The allowed parameter types
-are the same as those listed under \l {custom property types} on this page.
+are the same as those listed under \l {Defining Property Attributes} on this page.
 
 To emit a signal, invoke it as a method. Any relevant
 \l{Signal handler attributes}{signal handlers} will be invoked when the signal
@@ -842,7 +842,7 @@ prefixing the properties and respective signal handlers with the name of the
 attaching type.
 
 For example, the \l ListView type has an attached property
-\l ListView.isCurrentItem that is available to each delegate object in a
+\l {ListView::isCurrentItem}{ListView.isCurrentItem} that is available to each delegate object in a
 ListView. This can be used by each individual delegate object to determine
 whether it is the currently selected item in the view:
 
diff --git a/src/qml/doc/src/syntax/propertybinding.qdoc b/src/qml/doc/src/syntax/propertybinding.qdoc
index 75efc358dd..48c17ff244 100644
--- a/src/qml/doc/src/syntax/propertybinding.qdoc
+++ b/src/qml/doc/src/syntax/propertybinding.qdoc
@@ -186,7 +186,7 @@ In this case, the function could also have referred to \c rect.width rather than
 \c this.width.
 
 Note that the value of \c this is not defined outside of its use in property binding.
-See \l {QML JavaScript Restrictions} for details.
+See \l {JavaScript Expression Restrictions in QML} for details.
 
 
 */
diff --git a/src/qml/doc/src/syntax/signals.qdoc b/src/qml/doc/src/syntax/signals.qdoc
index 6cc68d30bf..3c203f36de 100644
--- a/src/qml/doc/src/syntax/signals.qdoc
+++ b/src/qml/doc/src/syntax/signals.qdoc
@@ -115,9 +115,9 @@ Even though the \l MouseArea documentation does not document a signal handler na
 
 \section2 Using the Connections Type
 
-In some cases it may be desirable to access a signal outside of the object that emits it. For these purposes, the QtQuick module provides the \l Connections type for connecting to signals of arbitrary objects. A \l Connections object can receive any signal from its specified \l {Connection::target}{target}.
+In some cases it may be desirable to access a signal outside of the object that emits it. For these purposes, the QtQuick module provides the \l Connections type for connecting to signals of arbitrary objects. A \l Connections object can receive any signal from its specified \l {Connections::target}{target}.
 
-For example, the \c onClicked handler in the earlier example could have been received by the root \l Rectangle instead, by placing the \c onClicked handler in a \l Connections object that has its \l {Connection::target}{target} set to the \l MouseArea:
+For example, the \c onClicked handler in the earlier example could have been received by the root \l Rectangle instead, by placing the \c onClicked handler in a \l Connections object that has its \l {Connections::target}{target} set to the \l MouseArea:
 
 \qml
 import QtQuick 2.0
@@ -204,7 +204,7 @@ SquareButton {
 }
 \endqml
 
-See \l {Custom signals} for more details on writing signals for custom QML types.
+See \l {Signal Attributes} for more details on writing signals for custom QML types.
 
 
 \keyword qml-connect-signals-to-method
diff --git a/src/qml/doc/src/typesystem/objecttypes.qdoc b/src/qml/doc/src/typesystem/objecttypes.qdoc
index 9d8f636f16..a73d723f26 100644
--- a/src/qml/doc/src/typesystem/objecttypes.qdoc
+++ b/src/qml/doc/src/typesystem/objecttypes.qdoc
@@ -47,10 +47,10 @@ and registering the type with the QML engine, as discussed in
 \l{qtqml-cppintegration-definetypes.html}{Defining QML Types from C++}.
 
 
-\section1 Creating Object Types from QML
+\section1 Defining Object Types from QML
 
 
-\section2 Creating Object Types from QML Documents
+\section2 Defining Object Types through QML Documents
 
 Plugin writers and application developers may provide types defined as QML
 documents.  A QML document, when visible to the QML import system, defines a
@@ -70,7 +70,7 @@ See \l {Defining Object Types through QML Documents} for more information.
 
 
 
-\section2 Creating Anonymous Types with Component
+\section2 Defining Anonymous Types with Component
 
 Another method of creating object types from within QML is to use the \l Component type.
 This allows a type to be defined inline within a QML document, instead of using a separate
@@ -114,9 +114,9 @@ different component scopes.
 See \l{qtqml-documents-scope.html}{Scope and Naming Resolution} for more details.
 
 
-\section1 Creating Object Types from C++
+\section1 Defining Object Types from C++
 
-Plugin writers and application developers may register types defined in C++
+C++ plugin writers and application developers may register types defined in C++
 through API provided by the Qt QML module.  There are various registration
 functions which each allow different use-cases to be fulfilled.
 
diff --git a/src/qml/doc/src/typesystem/topic.qdoc b/src/qml/doc/src/typesystem/topic.qdoc
index decfdb4e6a..3fe17943bb 100644
--- a/src/qml/doc/src/typesystem/topic.qdoc
+++ b/src/qml/doc/src/typesystem/topic.qdoc
@@ -53,11 +53,8 @@ integers, double-precision floating point numbers, strings, and boolean values.
 Objects may have properties of these types, and values of these types may be
 passed as arguments to methods of objects.
 
-See the \l{qtqml-typesystem-basictypes.html}{Basic Types} documentation for
-more information about basic types, or the \l{qtqml-documents-properties.html}
-{QML Documents - Object Properties} documentation for more information about
-other available property types.
-
+See the \l{qtqml-typesystem-basictypes.html}{QML Basic Types} documentation for
+more information about basic types.
 
 \section1 JavaScript Types