5 files changed, 34 insertions, 15 deletions
diff --git a/src/webengine/doc/src/external-resources.qdoc b/src/webengine/doc/src/external-resources.qdoc
index 7ff6eea6b..e4fe9bba6 100644
--- a/src/webengine/doc/src/external-resources.qdoc
+++ b/src/webengine/doc/src/external-resources.qdoc
@@ -146,3 +146,8 @@
     \externalpage https://developer.mozilla.org/en-US/docs/Web/API/Navigator/registerProtocolHandler
     \title registerProtocolHandler
 */
+
+/*!
+    \externalpage https://www.w3.org/TR/notifications
+    \title Web Notifications API
+*/
diff --git a/src/webengine/doc/src/qtwebengine-examples.qdoc b/src/webengine/doc/src/qtwebengine-examples.qdoc
index 1f1780764..24604e3dd 100644
--- a/src/webengine/doc/src/qtwebengine-examples.qdoc
+++ b/src/webengine/doc/src/qtwebengine-examples.qdoc
@@ -28,7 +28,7 @@
 /*!
     \group webengine-examples
     \title Qt WebEngine Examples
-    \brief Examples demonstrating the Qt WebEngine usage
+    \brief Examples demonstrating the Qt WebEngine usage.
     \ingroup all-examples
 
     These examples and demonstrations show a range of different uses for \l{Qt WebEngine},
diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webengine/doc/src/qtwebengine-features.qdoc
index 64e9badb1..f53c118a8 100644
--- a/src/webengine/doc/src/qtwebengine-features.qdoc
+++ b/src/webengine/doc/src/qtwebengine-features.qdoc
@@ -50,7 +50,7 @@
         \li \l{Touch}
         \li \l{View Source}
         \li \l{WebRTC}
-        \li \l{Notifications}
+        \li \l{Web Notifications}
     \endlist
 
     \section1 Audio and Video Codecs
@@ -513,9 +513,9 @@
     opening \c https://test.webrtc.org/ in \l{WebEngine Widgets Simple Browser
     Example}{Simple Browser} or \l{WebEngine Quick Nano Browser}{Nano Browser}.
 
-    \section1 Notifications
+    \section1 Web Notifications
 
-    Qt WebEngine supports JavaScript Web Notification API.
+    Qt WebEngine supports JavaScript \l{Web Notifications API}.
     The application has to explicitly allow the feature by using
     QWebEnginePage::Notifications or \l{WebEngineView::Feature}
     {WebEngineView.Notifications}.
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index bd5569e3f..58c0708cc 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -149,9 +149,19 @@
     engine must be initialized by using \l QtWebEngine::initialize in the application main source
     file, as illustrated by the following code snippet:
 
-    \quotefromfile webengine/minimal/main.cpp
-    \skipto main
-    \printuntil }
+    \code
+    int main(int argc, char *argv[])
+    {
+        QGuiApplication app(argc, argv);
+
+        QtWebEngine::initialize();
+
+        QQmlApplicationEngine engine;
+        engine.load(QUrl("qrc:/main.qml"));
+
+        return app.exec();
+    }
+    \endcode
 
     An application can load pages into the WebEngineView, using either an URL or HTML string, and
     navigate within session history. By default, links to different pages load within the same
@@ -228,14 +238,18 @@
     are automatically retrieved from the system. Settings from an installed QNetworkProxyFactory
     will be ignored, though.
 
-    Not all properties of QNetworkProxy are supported by Qt WebEngine. That is,
-    QNetworkProxy::type(), QNetworkProxy::hostName() and QNetworkProxy::port() are taken into
-    account. All other proxy settings such as QNetworkProxy::rawHeader(), QNetworkProxy::user(), or
-    QNetworkProxy::password() are ignored.
+    In case QNetworkProxy::user() and QNetworkProxy::password() are set, these credentials
+    will be automatically used for proxy authentication. It is up to the user to provide valid
+    credentials, since there is no error handling callback.
 
-    If a proxy requires authentication, QWebEnginePage::proxyAuthenticationRequired is emitted.
+    If no credentials are set with QNetworkProxy, but the proxy requires authentication,
+    QWebEnginePage::proxyAuthenticationRequired is emitted.
     For Qt Quick, a dialog is shown.
 
+    Not all properties of QNetworkProxy are supported by Qt WebEngine. That is,
+    QNetworkProxy::type(), QNetworkProxy::hostName() and QNetworkProxy::port() are taken into
+    account. All other proxy settings such as QNetworkProxy::rawHeader() are ignored.
+
     \section1 High DPI Support
 
     To support High DPI devices, it is recommended that the application attribute
diff --git a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
index 17c29a126..540d74035 100644
--- a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
+++ b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \qmlmodule QtWebEngine 1.8
+    \qmlmodule QtWebEngine 1.9
     \title Qt WebEngine QML Types
-    \brief Provides QML types for rendering web content within a QML application
+    \brief Provides QML types for rendering web content within a QML application.
     \ingroup qtwebengine-modules
     \ingroup qmlmodules
 
@@ -36,7 +36,7 @@
     your .qml file:
 
     \badcode
-    import QtWebEngine 1.8
+    import QtWebEngine 1.9
     \endcode
 
     To link against the module, add the following QT variable to your qmake .pro