summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2011-01-25 13:04:09 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2011-01-25 13:04:09 (GMT)
commitd28b06eeaaac030901c2f8929a5628349ed1bd2e (patch)
treedcdaf75de75cdc52c230371bc764d7e57a6f277f /doc/src/declarative
parentd34466a2c4fef4d6b53b3d6fbf285260de9fa0ed (diff)
downloadQt-d28b06eeaaac030901c2f8929a5628349ed1bd2e.zip
Qt-d28b06eeaaac030901c2f8929a5628349ed1bd2e.tar.gz
Qt-d28b06eeaaac030901c2f8929a5628349ed1bd2e.tar.bz2
Doc: fixing bugs and typos based on feedback
Diffstat (limited to 'doc/src/declarative')
-rw-r--r--doc/src/declarative/globalobject.qdoc2
-rw-r--r--doc/src/declarative/qtprogrammers.qdoc2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 8671b48..d48b5d3 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -48,7 +48,7 @@ data from over a network.
The XMLHttpRequest API implements the same \l {http://www.w3.org/TR/XMLHttpRequest/}{W3C standard}
as many popular web browsers with following exceptions:
\list
-\i QML's XMLHttpRequest does not enforce the same origin policty.
+\i QML's XMLHttpRequest does not enforce the same origin policy.
\i QML's XMLHttpRequest does not support \e synchronous requests.
\endlist
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index 7895c9f..b7d09a1 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -103,7 +103,7 @@ So, to implement your reusable button, you would simply build a QML component.
Parent widgets each provide a generic way to interface to one or more arbitrary other widgets.
A QTabWidget provides an interface to multiple "pages", one of which is visible at any time,
-and a mechanism for selecting among them (the QTabBar). A QScollArea provides scrollbars around
+and a mechanism for selecting among them (the QTabBar). A QScrollArea provides scrollbars around
a widget that is otherwise too large to fit in available space.
Nearly all such components can be created directly in QML. Only a few cases