[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
kov at webkit.org
kov at webkit.org
Thu Apr 8 02:20:59 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit f1c8507d6a25927d8e2e2b77438c76beb19d113f
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 12 18:36:58 2010 +0000
2010-03-12 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Rubber-stamped by Kenneth Rohde Christiansen.
Misc documentation fixes. Fixes (almost) all warnings emitted by
the documentation build process. Only the broken references to JSC
objects remain.
* webkit/webkitsecurityorigin.cpp:
* webkit/webkitwebbackforwardlist.cpp:
* webkit/webkitwebdatasource.cpp:
* webkit/webkitwebframe.cpp:
* webkit/webkitwebhistoryitem.cpp:
* webkit/webkitwebinspector.cpp:
(webkit_web_inspector_class_init):
* webkit/webkitwebsettings.cpp:
(webkit_web_settings_class_init):
* webkit/webkitwebview.cpp:
(DNDContentsRequest::webkit_web_view_class_init):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55915 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 2a289e2..26fa51b 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,23 @@
+2010-03-12 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Rubber-stamped by Kenneth Rohde Christiansen.
+
+ Misc documentation fixes. Fixes (almost) all warnings emitted by
+ the documentation build process. Only the broken references to JSC
+ objects remain.
+
+ * webkit/webkitsecurityorigin.cpp:
+ * webkit/webkitwebbackforwardlist.cpp:
+ * webkit/webkitwebdatasource.cpp:
+ * webkit/webkitwebframe.cpp:
+ * webkit/webkitwebhistoryitem.cpp:
+ * webkit/webkitwebinspector.cpp:
+ (webkit_web_inspector_class_init):
+ * webkit/webkitwebsettings.cpp:
+ (webkit_web_settings_class_init):
+ * webkit/webkitwebview.cpp:
+ (DNDContentsRequest::webkit_web_view_class_init):
+
2010-03-11 Anders Carlsson <andersca at apple.com>
Reviewed by David Hyatt.
diff --git a/WebKit/gtk/webkit/webkitsecurityorigin.cpp b/WebKit/gtk/webkit/webkitsecurityorigin.cpp
index cd80236..ca985e2 100644
--- a/WebKit/gtk/webkit/webkitsecurityorigin.cpp
+++ b/WebKit/gtk/webkit/webkitsecurityorigin.cpp
@@ -353,7 +353,7 @@ void webkit_security_origin_set_web_database_quota(WebKitSecurityOrigin* securit
*
* Returns a list of all Web Databases in the security origin.
*
- * Returns: a #Glist of databases in the security origin.
+ * Returns: a #GList of databases in the security origin.
*
* Since: 1.1.14
**/
diff --git a/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp b/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
index 31631a5..a49c6ad 100644
--- a/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
+++ b/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
@@ -252,7 +252,7 @@ GList* webkit_web_back_forward_list_get_back_list_with_limit(WebKitWebBackForwar
/**
* webkit_web_back_forward_list_get_back_item:
- * @web_back_forward_list: a #WebBackForwardList
+ * @web_back_forward_list: a #WebKitWebBackForwardList
*
* Returns the item that precedes the current item
*
@@ -383,7 +383,7 @@ gint webkit_web_back_forward_list_get_forward_length(WebKitWebBackForwardList* w
*
* Returns the maximum limit of the back forward list.
*
- * Return value: a #gint indicating the number of #WebHistoryItem the back forward list can hold
+ * Return value: a #gint indicating the number of #WebKitWebHistoryItem the back forward list can hold
*/
gint webkit_web_back_forward_list_get_limit(WebKitWebBackForwardList* webBackForwardList)
{
diff --git a/WebKit/gtk/webkit/webkitwebdatasource.cpp b/WebKit/gtk/webkit/webkitwebdatasource.cpp
index 059688e..9b755ad 100644
--- a/WebKit/gtk/webkit/webkitwebdatasource.cpp
+++ b/WebKit/gtk/webkit/webkitwebdatasource.cpp
@@ -418,9 +418,9 @@ G_CONST_RETURN gchar* webkit_web_data_source_get_unreachable_uri(WebKitWebDataSo
* @data_source: a #WebKitWebDataSource
*
* Gives you a #GList of #WebKitWebResource objects that compose the
- * #WebView to which this #WebKitWebDataSource is attached.
+ * #WebKitWebView to which this #WebKitWebDataSource is attached.
*
- * Return value: a #GList of #WebKitResource objects; the objects are
+ * Return value: a #GList of #WebKitWebResource objects; the objects are
* owned by WebKit, but the GList must be freed.
*
* Since: 1.1.15
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index 540df29..9876c1a 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -942,7 +942,7 @@ static void end_print_callback(GtkPrintOperation* op, GtkPrintContext* context,
* @action: the #GtkPrintOperationAction to be performed
* @error: #GError for error return
*
- * Prints the given #WebKitFrame, using the given #GtkPrintOperation
+ * Prints the given #WebKitWebFrame, using the given #GtkPrintOperation
* and #GtkPrintOperationAction. This function wraps a call to
* gtk_print_operation_run() for printing the contents of the
* #WebKitWebFrame.
@@ -980,7 +980,7 @@ GtkPrintOperationResult webkit_web_frame_print_full(WebKitWebFrame* frame, GtkPr
* webkit_web_frame_print:
* @frame: a #WebKitWebFrame
*
- * Prints the given #WebKitFrame, by presenting a print dialog to the
+ * Prints the given #WebKitWebFrame, by presenting a print dialog to the
* user. If you need more control over the printing process, see
* webkit_web_frame_print_full().
*
diff --git a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
index f2811ea..cfcfdb4 100644
--- a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
+++ b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
@@ -37,7 +37,7 @@
*
* A history item consists out of a title and a uri. It can be part of the
* #WebKitWebBackForwardList and the global history. The global history is used
- * for coloring the links of visited sites. #WebKitHistoryItem's constructed with
+ * for coloring the links of visited sites. #WebKitWebHistoryItem's constructed with
* #webkit_web_history_item_new and #webkit_web_history_item_new_with_data are
* automatically added to the global history.
*
diff --git a/WebKit/gtk/webkit/webkitwebinspector.cpp b/WebKit/gtk/webkit/webkitwebinspector.cpp
index 2feb064..820b20f 100644
--- a/WebKit/gtk/webkit/webkitwebinspector.cpp
+++ b/WebKit/gtk/webkit/webkitwebinspector.cpp
@@ -125,7 +125,7 @@ static void webkit_web_inspector_class_init(WebKitWebInspectorClass* klass)
/**
* WebKitWebInspector::inspect-web-view:
* @web_inspector: the object on which the signal is emitted
- * @web_view: the #WebKitWeb which will be inspected
+ * @web_view: the #WebKitWebView which will be inspected
* @return: a newly allocated #WebKitWebView or %NULL
*
* Emitted when the user activates the 'inspect' context menu item
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index 3fff35c..7ec6154 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -825,9 +825,9 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
/**
* WebKitWebSettings:enable-java-applet:
*
- * Enable or disable support for the Java <applet> tag. Keep in
+ * Enable or disable support for the Java <applet> tag. Keep in
* mind that Java content can be still shown in the page through
- * <object> or <embed>, which are the preferred tags for this task.
+ * <object> or <embed>, which are the preferred tags for this task.
*
* Since: 1.1.22
*/
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 274030c..e2a4017 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -1489,7 +1489,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
* @web_view: the object on which the signal is emitted
* @frame: the #WebKitWebFrame that required the navigation
* @request: a #WebKitNetworkRequest
- * @navigation_action: a #WebKitWebNavigation
+ * @navigation_action: a #WebKitWebNavigationAction
* @policy_decision: a #WebKitWebPolicyDecision
*
* Emitted when @frame requests opening a new window. With this
@@ -1536,7 +1536,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
* @web_view: the object on which the signal is emitted
* @frame: the #WebKitWebFrame that required the navigation
* @request: a #WebKitNetworkRequest
- * @navigation_action: a #WebKitWebNavigation
+ * @navigation_action: a #WebKitWebNavigationAction
* @policy_decision: a #WebKitWebPolicyDecision
*
* Emitted when @frame requests a navigation to another page.
@@ -2132,7 +2132,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
* @uri: the URI to load
* @param: a #GHashTable with additional attributes (strings)
*
- * The #WebKitWebView::create-plugin signal will be emitted to
+ * The #WebKitWebView::create-plugin-widget signal will be emitted to
* create a plugin widget for embed or object HTML tags. This
* allows to embed a GtkWidget as a plugin into HTML content. In
* case of a textual selection of the GtkWidget WebCore will attempt
@@ -2159,7 +2159,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
* @frame: the relevant frame
* @database: the #WebKitWebDatabase which exceeded the quota of its #WebKitSecurityOrigin
*
- * The #WebKitWebView::database-exceeded-quota signal will be emitted when
+ * The #WebKitWebView::database-quota-exceeded signal will be emitted when
* a Web Database exceeds the quota of its security origin. This signal
* may be used to increase the size of the quota before the originating
* operation fails.
@@ -3391,7 +3391,7 @@ gboolean webkit_web_view_search_text(WebKitWebView* webView, const gchar* string
* @web_view: a #WebKitWebView
* @string: a string to look for
* @case_sensitive: whether to respect the case of text
- * @limit: the maximum number of strings to look for or %0 for all
+ * @limit: the maximum number of strings to look for or 0 for all
*
* Attempts to highlight all occurances of #string inside #web_view.
*
@@ -3689,7 +3689,7 @@ void webkit_web_view_set_editable(WebKitWebView* webView, gboolean flag)
*
* This function returns the list of targets this #WebKitWebView can
* provide for clipboard copying and as DND source. The targets in the list are
- * added with %info values from the #WebKitWebViewTargetInfo enum,
+ * added with values from the #WebKitWebViewTargetInfo enum,
* using gtk_target_list_add() and
* gtk_target_list_add_text_targets().
*
@@ -3706,7 +3706,7 @@ GtkTargetList* webkit_web_view_get_copy_target_list(WebKitWebView* webView)
*
* This function returns the list of targets this #WebKitWebView can
* provide for clipboard pasting and as DND destination. The targets in the list are
- * added with %info values from the #WebKitWebViewTargetInfo enum,
+ * added with values from the #WebKitWebViewTargetInfo enum,
* using gtk_target_list_add() and
* gtk_target_list_add_text_targets().
*
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list