Fix some documentation errors.

Change-Id: I1aa99b483c1cc4accba185bfdee12397af617e50
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

5 files changed, 7 insertions, 18 deletions

diff --git a/src/assistant/assistant/doc/src/assistant-manual.qdoc b/src/assistant/assistant/doc/src/assistant-manual.qdoc
index 35a31840f..c391bd1f0 100644
--- a/src/assistant/assistant/doc/src/assistant-manual.qdoc
+++ b/src/assistant/assistant/doc/src/assistant-manual.qdoc
@@ -30,7 +30,7 @@
     \title Qt Assistant Manual
     \ingroup qttools
 
-    \startpage {Qt Reference Documentation}
+    \startpage {Qt Reference Pages}
     \nextpage Qt Assistant Quick Guide
 
     \keyword Qt Assistant
@@ -568,7 +568,7 @@
     \endtable
 
     In addition to those \QA specific tags, the tags for generating and registering
-    documentation can be used. See \l{Qt Help Collection Project} documentation for more information.
+    documentation can be used. See \l{Qt Help Collection Files} documentation for more information.
 
     An example of a help collection file that uses all the available tags is shown below:
 
diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp
index 2d09af46f..9a8da52b4 100644
--- a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp
+++ b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp
@@ -431,7 +431,7 @@ QAction *QDesignerFormWindowManagerInterface::actionSimplifyLayout() const
 */
 
 /*!
-   \fn QDesignerFormWindowInterface *QDesignerFormWindowManagerInterface::formWindow(int index)
+   \fn QDesignerFormWindowInterface *QDesignerFormWindowManagerInterface::formWindow(int index) const
    Returns the form window at the given \a index.
 
    \sa setActiveFormWindow(), removeFormWindow()
diff --git a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
index 2aacd1635..e3839fd79 100644
--- a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
+++ b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
@@ -71,7 +71,7 @@ QDesignerFormWindowManager::~QDesignerFormWindowManager()
 }
 
 /*!
-    \fn PreviewManager *QDesignerFormWindowManager::previewManager()
+    \fn PreviewManager *QDesignerFormWindowManager::previewManager() const
 
     Accesses the previewmanager implementation.
 
@@ -85,15 +85,4 @@ void QDesignerFormWindowManager::showPluginDialog()
     dlg.exec();
 }
 
-/*!
-    \fn void QDesignerFormWindowManager::formWindowSettingsChanged(QDesignerFormWindowInterface *fw);
-
-    This signal is emitted when the form settings dialog was shown
-    and changes have been made to the form.
-
-    \since 4.5
-    \internal
-*/
-
-
 QT_END_NAMESPACE
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 7dde47ca5..b2d00093f 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -147,9 +147,9 @@ public:
     The QFormBuilder class is typically used by custom components and
     applications that embed \QD. Standalone applications that need to
     dynamically generate user interfaces at run-time use the
-    QUiLoader, found in the QtUiTools module.
+    QUiLoader, found in the \l{Qt UI Tools} module.
 
-    \sa {QtUiTools Module}
+    \sa {Qt UI Tools}
 */
 
 /*!
diff --git a/src/linguist/linguist/doc/src/linguist-manual.qdoc b/src/linguist/linguist/doc/src/linguist-manual.qdoc
index 390dc0d7b..c0d1b07ed 100644
--- a/src/linguist/linguist/doc/src/linguist-manual.qdoc
+++ b/src/linguist/linguist/doc/src/linguist-manual.qdoc
@@ -974,7 +974,7 @@
     We recommend concatenating the \c .qm files of the modules required to
     one file matching the meta catalog file name using the tool \l lconvert in
     the deploy step. For example, to create a German translation file for an
-    application using the modules \l QtCore, \l QtGui and \l {Qt Declarative},
+    application using the modules \l{Qt Core}, \l {Qt GUI}, and \l {Qt Quick},
     run:
 
     \code