Doc: cleanup remaining "labs" references

Change-Id: I5b0015476c3ceef8f82b00d99b084b1ce3bfaa6f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

8 files changed, 9 insertions, 13 deletions

diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc
index dedfad4c..d99b3880 100644
--- a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc
+++ b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc
@@ -39,6 +39,8 @@
 
     \generatelist {qmltypesbymodule Qt.labs.calendar}
 
+    \labs
+
     \section1 Related Information
 
     \list
diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc
index b363195a..a94e5ec6 100644
--- a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc
+++ b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc
@@ -46,6 +46,8 @@
 
     \generatelist {qmltypesbymodule Qt.labs.calendar}
 
+    \labs
+
     \section1 Related Information
 
     \list
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
index a1a6f2f4..c0a53d2f 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
@@ -164,7 +164,7 @@
     \section3 Preparing for Migration
 
     With this in mind, a good way to prepare for a migration to Qt Quick
-    Labs is to place each control that you have a custom style for in its
+    Controls 2 is to place each control that you have a custom style for in its
     own QML file. For example, the Qt Quick Controls button above could be moved to a
     file named Button.qml, and used in the following manner:
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index 7c9e27ab..86f78bd2 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -199,8 +199,6 @@
     \value Material.Grey \stylecolor {#9E9E9E} {}
     \value Material.BlueGrey \stylecolor {#607D8B} {}
 
-    \labs
-
     \section1 Attached Property Documentation
 
     \styleproperty {Material.accent} {color} {accent-attached-prop}
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
index deff846d..441f0513 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
@@ -49,8 +49,6 @@
     import Qt.labs.calendar 1.0
     \endcode
 
-    \labs
-
     \section1 QML Types
 
     \section2 QtQuick.Controls Module
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
index a1803409..665f4f6f 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
@@ -158,8 +158,6 @@
     style-specific tweaks can be applied without creating a hard dependency to
     a style.
 
-    \labs
-
     \section1 Attached Property Documentation
 
     \styleproperty {Universal.accent} {color} {accent-attached-prop}
diff --git a/src/imports/controls/doc/src/templates/qtquicktemplates2-index.qdoc b/src/imports/controls/doc/src/templates/qtquicktemplates2-index.qdoc
index 2472c03c..2e22196b 100644
--- a/src/imports/controls/doc/src/templates/qtquicktemplates2-index.qdoc
+++ b/src/imports/controls/doc/src/templates/qtquicktemplates2-index.qdoc
@@ -30,7 +30,7 @@
     \title Qt Quick Templates 2
     \brief A set of templates to create user interface controls in Qt Quick
 
-    Qt Labs Templates are the foundations of \l {Qt Quick Controls 2}. Templates
+    Qt Quick Templates are the foundations of \l {Qt Quick Controls 2}. Templates
     are non-visual implementations of controls' logic and behavior. They offer
     an interface to visualize the controls in QML using \l {Qt Quick}.
 
diff --git a/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc b/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc
index 0c1dd008..1ddfe763 100644
--- a/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc
+++ b/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc
@@ -29,7 +29,7 @@
     \qmlmodule QtQuick.Templates 2.0
     \title Qt Quick Templates 2 QML Types
     \ingroup qmlmodules
-    \brief Provides QML types for templates (Qt Labs Templates).
+    \brief Provides QML types for templates (Qt Quick Templates).
 
     The \l {Qt Quick Templates 2} module provides a set of non-visual templates
     that can be used to build user interface controls in QML using \l {Qt Quick}.
@@ -41,12 +41,10 @@
     import QtQuick.Templates 2.0 as T
     \endcode
 
-    \labs
-
     For the sake of clarity, there is a one-to-one mapping between the types
-    provided by the \c Qt.labs.templates and \c QtQuick.Controls imports. For
+    provided by the \c QtQuick.Templates and \c QtQuick.Controls imports. For
     every type available in the \c QtQuick.Controls import, a non-visual template
-    type by the same name exists in the \c Qt.labs.templates import.
+    type by the same name exists in the \c QtQuick.Templates import.
 
     \note It is recommended to use a namespace for the templates import to avoid
     overlap with the types provided by the \c QtQuick.Controls import.