Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2

4 files changed, 8 insertions, 8 deletions

diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc
index aa4a933..d2687ea 100644
--- a/doc/src/widgets-and-layouts/layout.qdoc
+++ b/doc/src/widgets-and-layouts/layout.qdoc
@@ -37,9 +37,9 @@
     \brief A tour of the standard layout managers and an introduction to custom
     layouts.
     
-    \previouspage Widget Classes
+    \previouspage Widgets and Layouts
     \contentspage Widgets and Layouts
-    \nextpage {Implementing Styles and Style Aware Widgets}{Styles}
+    \nextpage {Styles and Style Aware Widgets}{Styles}
 
     \ingroup frameworks-technologies
 
@@ -242,7 +242,7 @@
 
     For further guidance when implementing these functions, see the
     \e{Qt Quarterly} article
-    \l{http://qt.nokia.com/doc/qq/qq04-height-for-width.html}
+    \l{http://doc.qt.nokia.com/qq/qq04-height-for-width.html}
     {Trading Height for Width}.
 
 
diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc
index eab7014..180260b 100644
--- a/doc/src/widgets-and-layouts/styles.qdoc
+++ b/doc/src/widgets-and-layouts/styles.qdoc
@@ -33,7 +33,7 @@
 
 /*!
     \page style-reference.html
-    \title Styles &amp Style Aware Widgets
+    \title Styles and Style Aware Widgets
     \ingroup qt-gui-concepts
     \brief Styles and the styling of widgets.
 
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 1390376..5c72570 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -32,7 +32,7 @@
 
     \ingroup frameworks-technologies
 
-    \previouspage {Implementing Styles and Style Aware Widgets}{Styles}
+    \previouspage {Styles and Style Aware Widgets}{Styles}
     \contentspage Widgets and Layouts
     \nextpage The Style Sheet Syntax
 
@@ -925,7 +925,7 @@
 
             The scroller is styled using the \l{#scroller-sub}{::scroller}.
 
-            The tear-off is styled using the \l{#tear-off-sub}{::tear-off}.
+            The tear-off is styled using the \l{#tearoff-sub}{::tearoff}.
 
            See \l{Qt Style Sheets Examples#Customizing QMenu}{Customizing QMenu}
            for an example.
@@ -3337,7 +3337,7 @@
         \o The tear indicator of a QTabBar.
 
     \row
-        \o \c ::tear-off \target tear-off-sub
+        \o \c ::tearoff \target tearoff-sub
         \o The tear-off indicator of a QMenu.
 
     \row
diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc
index 18b8be1..fbce744 100644
--- a/doc/src/widgets-and-layouts/widgets.qdoc
+++ b/doc/src/widgets-and-layouts/widgets.qdoc
@@ -67,7 +67,7 @@
 
   \section1 Widget Styles
 
-  \l{Styles &amp Style Aware Widgets}{Styles} draw on behalf of
+  \l{Styles and Style Aware Widgets}{Styles} draw on behalf of
   widgets and encapsulate the look and feel of a GUI. Qt's built-in
   widgets use the QStyle class to perform nearly all of their drawing,
   ensuring that they look exactly like the equivalent native widgets.