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

3 files changed, 3 insertions, 1 deletions

diff --git a/doc/src/images/xml-schema.png b/doc/src/images/xml-schema.png
new file mode 100644
index 0000000..b1bcecc
--- /dev/null
+++ b/doc/src/images/xml-schema.png
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 788af67..65d335b 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -140,7 +140,7 @@
 
     Even though some Tier 3 platforms are available under the Qt Commercial License,
     technical support is not included in that license.
-    However, \l{Hot to Order}{contact our sales team} to find out about the
+    However, \l{How to Order}{contact our sales team} to find out about the
     availability of other services for those platforms.
 
     Qt users should note, however, that there may be various open source
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 47eab16..1fd62be 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -627,6 +627,8 @@
     through C++ APIs in the Qt application, or using the xmlpatternsvalidator
     command line utility. The implementation of XML Schema Validation supports
     the specification version 1.0 in large parts.
+    
+    \img xml-schema.png
 
     See the \l{XML Processing} and QXmlSchema class documentation for more
     information.