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

1 files changed, 5 insertions, 3 deletions

diff --git a/doc/src/xml-processing/xml-processing.qdoc b/doc/src/xml-processing/xml-processing.qdoc
index 0d58301..dcdd8d1 100644
--- a/doc/src/xml-processing/xml-processing.qdoc
+++ b/doc/src/xml-processing/xml-processing.qdoc
@@ -32,13 +32,15 @@
     \brief Classes that support XML, via, for example DOM and SAX.
 
     These classes are relevant to XML users.
-    
+
     \generatelist{related}
 */
 
 /*!
     \page xml-processing.html
     \title XML Processing
+    \ingroup technology-apis    
+
     \brief An Overview of the XML processing facilities in Qt.
 
     In addition to core XML support, classes for higher level querying
@@ -57,7 +59,7 @@
     \o \l {XML Streaming}
     \o \l {The SAX Interface}
     \o \l {Working with the DOM Tree}
-    \o \l {Using XML Technologies}{XQuery/XPath and XML Schema}
+    \o \l {XQuery}{XQuery/XPath and XML Schema}
         \list
         \o \l{A Short Path to XQuery}
         \endlist
@@ -525,7 +527,7 @@
 
     \previouspage The SAX Interface
     \contentspage XML Processing
-    \nextpage {Using XML Technologies}{XQuery/XPath and XML Schema}
+    \nextpage {XQuery}{XQuery/XPath and XML Schema}
 
     DOM Level 2 is a W3C Recommendation for XML interfaces that maps the
     constituents of an XML document to a tree structure. The specification