Doc: Language and style fixes to the XML Patterns documentation.

Reviewed-by: Trust Me

1 files changed, 18 insertions, 22 deletions

diff --git a/doc/src/xml-processing/xquery-introduction.qdoc b/doc/src/xml-processing/xquery-introduction.qdoc
index 93a33c1..25fa13f 100644
--- a/doc/src/xml-processing/xquery-introduction.qdoc
+++ b/doc/src/xml-processing/xquery-introduction.qdoc
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 /*!
-    \page xquery-introduction.html
-    \title A Short Path to XQuery
+\page xquery-introduction.html
+\title A Short Path to XQuery
 
-    \startpage Using XML Technologies
-    \target XQuery-introduction
+\startpage Using XML Technologies
+\target XQuery-introduction
 
 XQuery is a language for querying XML data or non-XML data that can be
 modeled as XML. XQuery is specified by the \l{http://www.w3.org}{W3C}.
@@ -119,7 +119,7 @@ following XQuery:
 
 \snippet snippets/code/doc_src_qtxmlpatterns.qdoc 18
 
-The \c{doc()} function loads the file \l{cookbook.xml} and returns the
+The \c{doc()} function loads the \c{cookbook.xml} file and returns the
 document node. The document node then becomes the focus for the next
 step \c{//recipe}. Here the double slash means select all \c{<recipe>}
 elements found below the document node, regardless of where they
@@ -535,7 +535,7 @@ methods is presented in the section on \l{Boolean Predicates}.
 
 There are many more functions and operators defined for XQuery and
 XPath. They are all \l{http://www.w3.org/TR/xpath-functions}
-{documented here}.
+{documented in the specification}.
 
 \section2 Positional Predicates
 
@@ -688,12 +688,12 @@ XQueries wherever expressions are allowed.
 
 \snippet snippets/code/doc_src_qtxmlpatterns.qdoc 40
 
-If \c{cookbook.xml} is loaded without error, a \c{<resept>} element
-(Norweigian word for recipe) is constructed for each \c{<recipe>}
+If \c{cookbook.xml} is loaded without error, a \c{<oppskrift>} element
+(Norwegian word for recipe) is constructed for each \c{<recipe>}
 element in the cookbook, and the child nodes of the \c{<recipe>} are
-copied into the \c{<resept>} element. But if the cookbook document
+copied into the \c{<oppskrift>} element. But if the cookbook document
 doesn't exist or does not contain well-formed XML, a single
-\c{<resept>} element is constructed containing an error message.
+\c{<oppskrift>} element is constructed containing an error message.
 
 \section1 Constructing Atomic Values
 
@@ -727,26 +727,23 @@ Sending this XQuery through xmlpatterns produces:
 
 \snippet snippets/code/doc_src_qtxmlpatterns.qdoc 40
 
-If \c{cookbook.xml} is loaded without error, a \c{<resept>} element
+If \c{cookbook.xml} is loaded without error, a \c{<oppskrift>} element
 (Norweigian word for recipe) is constructed for each \c{<recipe>}
 element in the cookbook, and the child nodes of the \c{<recipe>} are
-copied into the \c{<resept>} element. But if the cookbook document
+copied into the \c{<oppskrift>} element. But if the cookbook document
 doesn't exist or does not contain well-formed XML, a single
-\c{<resept>} element is constructed containing an error message.
+\c{<oppskrift>} element is constructed containing an error message.
 
 \section1 Running The Cookbook Examples
 
-Most of the XQuery examples in this document refer to the cookbook
-written in XML shown below. Save it as \c{cookbook.xml}. In the same
-directory, save one of the cookbook XQuery examples in a \c{.xq} file
-(e.g. \c{file.xq}). Run the XQuery using Qt's command line utility:
+Most of the XQuery examples in this document refer to the
+\c{cookbook.xml} example file from the \l{Recipes Example}.
+Copy the \c{cookbook.xml} to your current directory, save one of the
+cookbook XQuery examples in a \c{.xq} file (e.g., \c{file.xq}), and
+run the XQuery using Qt's command line utility:
 
 \snippet snippets/code/doc_src_qtxmlpatterns.qdoc 6
 
-\section2 cookbook.xml
-
-\snippet snippets/code/doc_src_qtxmlpatterns.qdoc 100
-
 \section1 Further Reading
 
 There is much more to the XQuery language than we have presented in
@@ -1019,5 +1016,4 @@ you want to use \c{true} and \c{false}. The other way is to invoke the
 boolean constructor:
 
 \quotefile snippets/patternist/xsBooleanTrue.xq
-
 */