Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

3 files changed, 4 insertions, 4 deletions

diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h
index 8e7bc21..d3db4e9 100644
--- a/src/corelib/tools/qbytearraymatcher.h
+++ b/src/corelib/tools/qbytearraymatcher.h
@@ -78,7 +78,7 @@ private:
     QByteArrayMatcherPrivate *d;
     QByteArray q_pattern;
 #ifdef Q_CC_RVCT
-// explicitely allow anonymous unions for RVCT to prevent compiler warnings
+// explicitly allow anonymous unions for RVCT to prevent compiler warnings
 #  pragma push
 #  pragma anon_unions
 #endif
diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc
index e60243f..d49c09e 100644
--- a/src/corelib/tools/qpair.qdoc
+++ b/src/corelib/tools/qpair.qdoc
@@ -35,7 +35,7 @@
     pair type is not available. It stores one value of type T1 and
     one value of type T2. It can be used as a return value for a
     function that needs to return two values, or as the value type of
-    a \l{generic container}.
+    a \l{Container classes}{generic container}.
 
     Here's an example of a QPair that stores one QString and one \c
     double value:
@@ -53,7 +53,7 @@
     requirements; these requirements are documented on a per-function
     basis.
 
-    \sa {Generic Containers}
+    \sa {Container Classes}
 */
 
 /*! \typedef QPair::first_type
diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h
index 1aafcb8..451aeb6 100644
--- a/src/corelib/tools/qstringmatcher.h
+++ b/src/corelib/tools/qstringmatcher.h
@@ -78,7 +78,7 @@ private:
     QString q_pattern;
     Qt::CaseSensitivity q_cs;
 #ifdef Q_CC_RVCT
-// explicitely allow anonymous unions for RVCT to prevent compiler warnings
+// explicitly allow anonymous unions for RVCT to prevent compiler warnings
 #  pragma push
 #  pragma anon_unions
 #endif