Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ibbab64e34150e1131fadf37f2e84a0a3f618974f

1 files changed, 6 insertions, 5 deletions

diff --git a/src/webchannel/doc/src/index.qdoc b/src/webchannel/doc/src/index.qdoc
index 635c8bd..5d012dc 100644
--- a/src/webchannel/doc/src/index.qdoc
+++ b/src/webchannel/doc/src/index.qdoc
@@ -29,9 +29,9 @@
     \page qtwebchannel-index.html
     \since 5.4
     \title Qt WebChannel
-    \brief Bridges the gap between C++/QML and HTML/JavaScript.
+    \brief Bridges the gap between Qt applications and HTML/JavaScript.
 
-    The Qt WebChannel module provides a library for seamless integration of C++/QML applications
+    The Qt WebChannel module provides a library for seamless integration of C++ and QML applications
     with HTML/JavaScript clients. Any QObject can be published to remote clients, where its public
     API becomes available.
 
@@ -40,8 +40,9 @@
     For more information on how to use this module, please refer to the following pages:
 
     \list
-    \li \l{Qt WebChannel C++ Classes} explains QWebChannel C++ API.
-    \li \l{Qt WebChannel QML Types} explains the WebChannel QML API.
-    \li The \l{Qt WebChannel Examples} show how use the API in practice.
+    \li \l{Qt WebChannel JavaScript API}{JavaScript API}
+    \li \l{Qt WebChannel C++ Classes}{C++ API}
+    \li \l{Qt WebChannel QML Types}{QML API}
+    \li \l{Qt WebChannel Examples}{Examples} - show how use the API in practice
     \endlist
 */