Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

3 files changed, 4 insertions, 5 deletions

diff --git a/doc/src/images/simpleanchorlayout-example.png b/doc/src/images/simpleanchorlayout-example.png
new file mode 100644
index 0000000000..1d5c8ac048
--- /dev/null
+++ b/doc/src/images/simpleanchorlayout-example.png
diff --git a/doc/src/platforms/qt-embedded.qdoc b/doc/src/platforms/qt-embedded.qdoc
index c39a967641..e0c35cc8ba 100644
--- a/doc/src/platforms/qt-embedded.qdoc
+++ b/doc/src/platforms/qt-embedded.qdoc
@@ -68,10 +68,9 @@
     environment and use native features, such as menus, to conform
     to the native style guidelines.
     \o \l{Symbian platform - Introduction to using Qt}{Qt for the Symbian
-platform} is used to create
-    applications running in existing Symbian platform environments.
-    Applications use the appropriate style for the embedded
-    environment and use native features, such as menus, to conform
+    platform} is used to create applications running in existing Symbian
+    platform environments. Applications use the appropriate style for the
+    embedded environment and use native features, such as menus, to conform
     to the native style guidelines.
     \endtable
 */
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index 728765604b..1eee805295 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -165,7 +165,7 @@
 */
 
 /*!
-    \externalpage http://qt.nokia.com/products/qtopia/
+    \externalpage http://www.qtextended.org/
     \title Qt Extended
 */