Merge old "Modules" docs into new doc structure

This removes modules/todo.qdoc which contained the old "Modules"
documentation page and merges this content into the new Modules
documentation.

Also cleaned up the structure of the "qmldir" docs.

Task-number: QTBUG-26378
Change-Id: Idc8800d0595647eb7064ecadc5a00254341ed1e8
Reviewed-by: Chris Adams <christopher.adams@nokia.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc
index 9e30ac3d3b..c69a884e2e 100644
--- a/src/qml/doc/src/qtqml.qdoc
+++ b/src/qml/doc/src/qtqml.qdoc
@@ -90,9 +90,10 @@ types, animation classes, and canvas integration) for the QML language.
 
     \li \l{qtqml-modules-topic.html}{QML Modules}
         \list
-        \li \l{qtqml-modules-topic.html#syntax-of-a-qmldir-file}{Packaging QML and JavaScript Files}
-        \li \l{qtqml-modules-cppplugins.html#creating-a-plugin}{Providing Types and Functionality in a C++ Plugin}
-        \li \l{qtqml-modules-qmldir.html}{Syntax of a qmldir File}
+        \li \l{qtqml-modules-locatedmodules.html}{Located Modules}
+        \li \l{qtqml-modules-installedmodules.html}{Installed Modules}
+        \li \l{qtqml-modules-qmldir.html}{Adding Module Metadata with a qmldir file}
+        \li \l{qtqml-modules-cppplugins.html}{Providing Types and Functionality in a C++ Plugin}
         \endlist
 
     \li \l{qtqml-documents-topic.html}{QML Documents}