summaryrefslogtreecommitdiffstats
path: root/examples/webengine
diff options
context:
space:
mode:
authorJüri Valdmann <juri.valdmann@qt.io>2017-06-06 11:27:17 +0200
committerJüri Valdmann <juri.valdmann@qt.io>2017-06-13 09:15:23 +0000
commitf03585b7583bd2e7328d462a63ee6ee8938b200c (patch)
treeb3dac95710335f485eb3614afaf3f9e3ec65f334 /examples/webengine
parentc2d6fc8d06447c4579811085f3c255cd30523ca7 (diff)
Fix some minor issues in example docs
Task-number: QTBUG-60655 Change-Id: Ie385232d5c126eafc18c08f49c15cc5e18c69ba1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'examples/webengine')
-rw-r--r--examples/webengine/customdialogs/doc/src/customdialogs.qdoc9
-rw-r--r--examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc2
2 files changed, 6 insertions, 5 deletions
diff --git a/examples/webengine/customdialogs/doc/src/customdialogs.qdoc b/examples/webengine/customdialogs/doc/src/customdialogs.qdoc
index f5a18b591..2162fe4ca 100644
--- a/examples/webengine/customdialogs/doc/src/customdialogs.qdoc
+++ b/examples/webengine/customdialogs/doc/src/customdialogs.qdoc
@@ -58,10 +58,11 @@
\section1 Triggering Dialogs
- The technical details on how the dialogs are triggered are beyond the scope
- of this example. The only thing worth mentioning is that we fire up the
- localhost TCP server when the example starts up. The server is needed to
- get proxy and HTTP authentication requests.
+ As mentioned, the \l {webengine/customdialogs/index.html}{index.html} file
+ is responsible for triggering the dialogs from the side of HTML and
+ JavaScript. Additionally, the example program starts a localhost TCP server
+ returning the mocked HTTP responses needed to trigger proxy and HTTP
+ authentication dialogs.
\section1 Custom Dialogs
diff --git a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
index 75c2997e8..93b3ed51a 100644
--- a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
+++ b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
@@ -43,7 +43,7 @@
screen mode by using a toolbar button. They can leave fullscreen mode by using a keyboard
shortcut. Additional toolbar buttons enable moving backwards and forwards in the browser
history, reloading tab content, and opening a settings menu for enabling the following features:
- JavaScript, plugins, fullscreen mode, off the record, HTTP disc cache, autoloading images, and
+ JavaScript, plugins, fullscreen mode, off the record, HTTP disk cache, autoloading images, and
ignoring certificate errors.
\include examples-run.qdocinc