Doc: Edited "Integrating Web Content" page

-made distinction between Qt WebKit and Qt WebKit Widget clearer
-corrected module names: "QtWebKit" to "Qt WebKit"
-replicated the information into the "User Interfaces" page

Change-Id: Ic1dd742dde2c567bb008a4e4b2f701521b30c79f
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

2 files changed, 45 insertions, 30 deletions

diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index c460f6a6..0ae752e4 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -99,17 +99,23 @@ type applications.
 \li \l{Internationalization with Qt}{Internationalization}
 \endlist
 
-\section1 Qt WebKit
+\section1 Displaying Web Content
 
-\l {QtWebKit} is a web content rendering engine based on the open source \l {http://www.webkit.org}{WebKit}
-project featuring broad support for standard web technologies.
-The Qt WebKit module provides integration with both the above Qt technologies,
-a \l {Qt Quick} WebView component as well as the Qt WebKit Widgets classes to render
-and interact with web content.
 
-The main difference in the underlying technology of the Qt Quick WebView component is
-that it utilizes a multi-process architecture (WebKit2) with a separate web rendering
-process whereas the Qt WebKit Widgets use a single-process architecture.
+Qt provides a \l{http://www.webkit.org/}{WebKit}-based layout engine
+with support for a wide range of standard web techologies such as HTML, CSS and
+JavaScript, that make it possible to embed content from the World Wide Web into
+your Qt application. Qt features both WebKit-based QML and C++ APIs.
+
+
+\l{Qt WebKit} displays web content through the \l WebView QML type while the
+\l{Qt WebKit Widgets} features a C++ API to render and interact with web
+content.
+
+The main difference between the two APIs is that WebView utilizes a multi-
+process architecture, \l{http://trac.webkit.org/wiki/WebKit2}{WebKit2}, with a
+separate web rendering process. The C++ API uses the previous version of WebKit,
+which has a single-process architecture.
 
 See also \l {Integrating Web Content}.
 
@@ -176,8 +182,8 @@ choose the best suited tool for the job.
         \li
         \li Qt Widgets provide all the bells and whistles, developed over two
             decades, needed for building standard industry type applications.
-            QtWebKit Widgets provide widgets and additional classes to render and
-            interact with web content.
+            Qt WebKit Widgets provide widgets and additional classes to render
+            and interact with web content.
     \row
         \li Model/View programming
         \li (X)
diff --git a/doc/src/web-content.qdoc b/doc/src/web-content.qdoc
index 464d586d..07fcc0cd 100644
--- a/doc/src/web-content.qdoc
+++ b/doc/src/web-content.qdoc
@@ -30,29 +30,38 @@
 \title Integrating Web Content
 \brief Qt's WebKit integration
 
-The QtWebKit module provides a \l {http://www.webkit.org/}{WebKit}-based layout engine with support for a wide range of
-standard web techologies such as HTML, CSS and JavaScript, that make it possible to embed content from the World Wide Web
-into your Qt application.
+Qt provides a \l {http://www.webkit.org/}{WebKit}-based layout engine
+with support for a wide range of standard web techologies such as HTML, CSS and
+JavaScript, that make it possible to embed content from the World Wide Web into
+your Qt application. Qt features both WebKit-based QML and C++ APIs.
 
-QtWebKit provides the QtWebKit Widgets C++ classes to integrate web content into your QWidget and QGraphicsView based application.
-QtWebKit also includes a \l {WebView} QML component for embedding into \l {Qt Quick}.
 
-\section1 QtWebKit Widgets integration
+\section1 WebKit for QML Applications
 
-The QtWebKit Widgets module provides a number of different classes with a feature-rich C++ API that facilitates loading, viewing
-and editing web documents (\l {QGraphicsWebView}, \l {QWebView}, \l {QWebPage}, \l {QWebFrame}) or traversing the document model
-represented by a tree structure of \l {http://www.w3.org/DOM/}{DOM} elements (\l {QWebElement}).
-The \l{WebKit in Qt}{QtWebKit Widgets} classes provide traditional in-process rendering of web content.
+\l{Qt WebKit} allows WebKit 2 functionality in QML applications by
+importing the \l{WebView} QML type. \l WebView has a minimalistic QML API for
+web content visualization. While it is not as feature-rich as the C++ API of the
+widget classes, it has multi-touch support and employs a multi-process
+architecture to render web content in a separate helper process (QtWebProcess).
+WebView makes it possible to interact with content using touch gestures such as
+panning with inertia (flick), pinch-zoom, tap and double- tap-to-zoom. The
+underlying split-process model (\l
+{http://trac.webkit.org/wiki/WebKit2}{WebKit2}) assures smooth animations in the
+embedding application (UI process) as well as increases stability.
 
-\section1 QtWebKit Qt Quick integration
+These pages have more information about QML:
+\list
+\l \l{Qt Webkit Examples}
+\l \l{QML Application Developer Resources}
+\endlist
 
-The QtWebKit module can be integrated into Qt Quick by importing the \l{WebView} QML component. The WebView item has a minimalistic QML API
-for web content visualization which is not as feature-rich as the C++ API of the widget classes but it has out-of-the-box multi-touch
-support and employs a multi-process architecture to render web content in a separate helper process (QtWebProcess).
-The WebView makes it possible to interact with content using touch gestures such as panning with inertia (flick), pinch-zoom,
-tap and double-tap-to-zoom. The underlying split-process model (\l {http://trac.webkit.org/wiki/WebKit2}{WebKit2}) assures
-smooth animations in the embedding application (UI process) as well as increases stability.
+\section1 Qt WebKit Widgets
+
+The \l{Qt WebKit Widgets} module provides a feature-rich C++ API that
+facilitates loading, viewing, and editing web documents. Qt WebKit Widgets
+provides facilities for rendering of HyperText Markup Language (HTML),
+Extensible HyperText Markup Language (XHTML) and Scalable Vector Graphics (SVG)
+documents, styled using Cascading Style Sheets (CSS) and scripted with
+JavaScript.
 
-Examples demonstrating how to embed web content into a Qt application can be found in the qtwebkit-examples-and-demos module.
-Specifically the QML examples flickrview and youtubeview in this module show how to integrate web content into a Qt Quick application.
 */