summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-10-16 06:20:19 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-10-16 06:20:19 (GMT)
commitb49b85d4c0decce35e1ad4a0b08dc9c0c82b384e (patch)
tree3e947e7ba5d06a827707777c80491ac8d1f013d9 /doc
parentdc66752f24442a0bb219a9a4810b47ba4ece3d5c (diff)
parentc017a4dc6b5a81136b3654ca0ac75630cdf11675 (diff)
downloadQt-b49b85d4c0decce35e1ad4a0b08dc9c0c82b384e.zip
Qt-b49b85d4c0decce35e1ad4a0b08dc9c0c82b384e.tar.gz
Qt-b49b85d4c0decce35e1ad4a0b08dc9c0c82b384e.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/network.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/network.qdoc b/doc/src/declarative/network.qdoc
index da4495f..e88dfdc 100644
--- a/doc/src/declarative/network.qdoc
+++ b/doc/src/declarative/network.qdoc
@@ -47,7 +47,7 @@ QML supports network transparency by using URLs (rather than file names) for all
references from a QML document to other content. Since a \i relative URL is the same
as a relative file, development of QML on regular file systems remains simple.
-\section1 Accessing Network Reesources from QML
+\section1 Accessing Network Resources from QML
Whenever an object has a property of type URL (QUrl), assigning a string to that
property will actually assign an absolute URL - by resolving the string against
@@ -105,7 +105,7 @@ The \c import statement only works network transparently if it has an "as" claus
All network access from QML is managed by a QNetworkAccessManager set on the QmlEngine which executes the QML.
By default, this is an unmodified Qt QNetworkAccessManager. You may set a different manager using
QmlEngine::setNetworkAccessManager() as appropriate for the policies of your application.
-For eample, the \l qmlviewer tool sets a new QNetworkAccessManager which
+For example, the \l qmlviewer tool sets a new QNetworkAccessManager which
trusts HTTP Expiry headers to avoid network cache checks, allows HTTP Pipelining, adds a persistent HTTP CookieJar,
a simple disk cache, and supports proxy settings.