summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-11-10 23:00:14 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-11-10 23:00:14 (GMT)
commitad925d41019d5e5c47143ab91f775f970995ad0d (patch)
treead05cea02ddf9c87b832fc7111bb1b09f5203408 /src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
parentb7d91c0d798bc10dd4f8a750723285076fb96935 (diff)
parent38e1ed3b51d6aad46912eb548490d038e58203d9 (diff)
downloadQt-ad925d41019d5e5c47143ab91f775f970995ad0d.zip
Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.tar.gz
Qt-ad925d41019d5e5c47143ab91f775f970995ad0d.tar.bz2
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/xmlpatterns/schema/qxsdschemaparser_setup.cpp')
-rw-r--r--src/xmlpatterns/schema/qxsdschemaparser_setup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp b/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
index 88e5f93..dc4730e 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp
@@ -53,7 +53,7 @@ using namespace QPatternist;
* This page describes how to use DFAs for validating that the XML child tags of an
* XML parent tag occur in the right order.
*
- * To validate the occurence of XML tags one need a regular expression that describes
+ * To validate the occurrence of XML tags one need a regular expression that describes
* which tags can appear how often in what context. For example the regular expression
* of the global <em>attribute</em> tag in XML Schema is (annotation?, simpleType?).
* That means the <em>attribute</em> tag can contain an <em>annotation</em> tag followed