summaryrefslogtreecommitdiffstats
path: root/doc/src/xml-processing/xquery-introduction.qdoc
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-22 01:05:17 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-22 01:05:17 (GMT)
commit0109df3ee449767c1836ec7028ac219c57cf9ca7 (patch)
tree5fdc90fd34ac4e49ba05bef47a86427e4df71917 /doc/src/xml-processing/xquery-introduction.qdoc
parent46e84339a9eaf1587528c20a4c9e05bc1b549afd (diff)
parent0a83a6c571fadb454cb8711aed84258b061d44b5 (diff)
downloadQt-0109df3ee449767c1836ec7028ac219c57cf9ca7.zip
Qt-0109df3ee449767c1836ec7028ac219c57cf9ca7.tar.gz
Qt-0109df3ee449767c1836ec7028ac219c57cf9ca7.tar.bz2
Merge remote branch 'origin/master' into bearermanagement/unit-tests
Conflicts: src/network/access/qnetworkaccessmanager.cpp
Diffstat (limited to 'doc/src/xml-processing/xquery-introduction.qdoc')
-rw-r--r--doc/src/xml-processing/xquery-introduction.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/xml-processing/xquery-introduction.qdoc b/doc/src/xml-processing/xquery-introduction.qdoc
index 84e21ab..9306420 100644
--- a/doc/src/xml-processing/xquery-introduction.qdoc
+++ b/doc/src/xml-processing/xquery-introduction.qdoc
@@ -75,7 +75,7 @@ It creates a new \c{<html>} element in the output and sets its \c{id}
attribute to be the \c{id} attribute from an \c{<html>} element in the
\c{other.html} file.
-\section1 Using Path Expressions To Match & Select Items
+\section1 Using Path Expressions To Match And Select Items
In C++ and Java, we write nested \c{for} loops and recursive functions
to traverse XML trees in search of elements of interest. In XQuery, we