Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocs

Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17

1 files changed, 7 insertions, 23 deletions

diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc
index 24c5629ae2..262add419c 100644
--- a/src/corelib/doc/src/containers.qdoc
+++ b/src/corelib/doc/src/containers.qdoc
@@ -26,22 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \group tools
-    \title Non-GUI Classes
-    \ingroup groups
-
-    \brief Collection classes such as list, queue, stack and string, along
-    with other classes that can be used without needing QApplication.
-
-    The non-GUI classes are general-purpose collection and string classes
-    that may be used independently of the GUI classes.
-
-    In particular, these classes do not depend on QApplication at all,
-    and so can be used in non-GUI programs.
-
-*/
-
-/*!
     \page containers.html
     \title Container Classes
     \ingroup technology-apis
@@ -394,13 +378,13 @@
     QMapIterator, which is somewhat different because it iterates on
     (key, value) pairs.
 
-    Like QListIterator, QMapIterator provides 
-    \l{QMapIterator::toFront()}{toFront()}, 
-    \l{QMapIterator::toBack()}{toBack()}, 
-    \l{QMapIterator::hasNext()}{hasNext()}, 
-    \l{QMapIterator::next()}{next()}, 
-    \l{QMapIterator::peekNext()}{peekNext()}, 
-    \l{QMapIterator::hasPrevious()}{hasPrevious()}, 
+    Like QListIterator, QMapIterator provides
+    \l{QMapIterator::toFront()}{toFront()},
+    \l{QMapIterator::toBack()}{toBack()},
+    \l{QMapIterator::hasNext()}{hasNext()},
+    \l{QMapIterator::next()}{next()},
+    \l{QMapIterator::peekNext()}{peekNext()},
+    \l{QMapIterator::hasPrevious()}{hasPrevious()},
     \l{QMapIterator::previous()}{previous()}, and
     \l{QMapIterator::peekPrevious()}{peekPrevious()}. The key and
     value components are extracted by calling key() and value() on