4 files changed, 13 insertions, 25 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
index cedd8ae..db4bfec 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
@@ -360,7 +360,7 @@ void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object
 }
 
 /*!
-    Returns the frame's content as HTML, enclosed in HTML and BODY tags.
+    Returns the frame's content, converted to HTML.
 
     \sa setHtml(), toPlainText()
 */
@@ -372,8 +372,7 @@ QString QWebFrame::toHtml() const
 }
 
 /*!
-    Returns the content of this frame converted to plain text, completely
-    stripped of all HTML formatting.
+    Returns the content of this frame converted to plain text.
 
     \sa toHtml()
 */
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 2decbca..66bc701 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -2139,12 +2139,10 @@ bool QWebPage::isContentEditable() const
 
 /*!
     \property QWebPage::forwardUnsupportedContent
-    \brief whether QWebPage should forward unsupported content
+    \brief whether QWebPage should forward unsupported content through the
+    unsupportedContent signal
 
-    If enabled, the unsupportedContent() signal is emitted with a network reply that
-    can be used to read the content.
-
-    If disabled, the download of such content is aborted immediately.
+    If disabled the download of such content is aborted immediately.
 
     By default unsupported content is not forwarded.
 */
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
index cc49499..8192e68 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
@@ -223,25 +223,17 @@ QWebSettings *QWebSettings::globalSettings()
     Each QWebPage object has its own QWebSettings object, which configures the
     settings for that page. If a setting is not configured, then it is looked
     up in the global settings object, which can be accessed using
-    globalSettings().
+    QWebSettings::globalSettings().
 
-    QWebSettings allows configuration of browser properties, such as font sizes and
-    families, the location of a custom style sheet, and generic attributes like
-    JavaScript and plugins. Individual attributes are set using the setAttribute()
-    function. The \l{QWebSettings::WebAttribute}{WebAttribute} enum further describes
-    each attribute.
+    QWebSettings allows configuring font properties such as font size and font
+    family, the location of a custom stylesheet, and generic attributes like java
+    script, plugins, etc. The \l{QWebSettings::WebAttribute}{WebAttribute}
+    enum further describes this.
 
-    QWebSettings also configures global properties such as the Web page memory
-    cache and the Web page icon database, local database storage and offline
+    QWebSettings also configures global properties such as the web page memory
+    cache and the web page icon database, local database storage and offline
     applications storage.
 
-    \section1 Enabling Plugins
-
-    Support for browser plugins can enabled by setting the
-    \l{QWebSettings::PluginsEnabled}{PluginsEnabled} attribute. For many applications,
-    this attribute is enabled for all pages by setting it on the
-    \l{globalSettings()}{global settings object}.
-
     \section1 Web Application Support
 
     WebKit provides support for features specified in \l{HTML 5} that improve the
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
index 119c126..06305e0 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
@@ -96,8 +96,7 @@
 
     Since WebKit supports the Netscape Plugin API, Qt applications can display
     Web pages that embed common plugins, as long as the user has the appropriate
-    binary files for those plugins installed and the \l{QWebSettings::PluginsEnabled}
-    attribute is set for the application.
+    binary files for those plugins installed.
 
     The following locations are searched for plugins: