From dcc8cf2e65d1aa555cce12431a16547e66b469ee Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 27 Apr 2010 16:31:00 +0100
Subject: Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
---
 WebKit/gtk/docs/webkitgtk-docs.sgml    |  4 ++++
 WebKit/gtk/docs/webkitgtk-sections.txt | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

(limited to 'WebKit/gtk/docs')

diff --git a/WebKit/gtk/docs/webkitgtk-docs.sgml b/WebKit/gtk/docs/webkitgtk-docs.sgml
index 77f3482..fb9ae09 100644
--- a/WebKit/gtk/docs/webkitgtk-docs.sgml
+++ b/WebKit/gtk/docs/webkitgtk-docs.sgml
@@ -18,6 +18,7 @@
     <xi:include href="xml/webkitwebhistoryitem.xml"/>
     <xi:include href="xml/webkitwebnavigationaction.xml"/>
     <xi:include href="xml/webkitwebpolicydecision.xml"/>
+    <xi:include href="xml/webkitgeolocationpolicydecision.xml"/>
     <xi:include href="xml/webkitnetworkrequest.xml"/>
     <xi:include href="xml/webkitnetworkresponse.xml"/>
     <xi:include href="xml/webkitwebinspector.xml"/>
@@ -103,4 +104,7 @@
   <index id="index-1.1.20" role="1.1.20">
     <title>Index of new symbols in 1.1.20</title>
   </index>
+  <index id="index-1.1.23" role="1.1.23">
+    <title>Index of new symbols in 1.1.23</title>
+  </index>
 </book>
diff --git a/WebKit/gtk/docs/webkitgtk-sections.txt b/WebKit/gtk/docs/webkitgtk-sections.txt
index 2379c8b..7f37484 100644
--- a/WebKit/gtk/docs/webkitgtk-sections.txt
+++ b/WebKit/gtk/docs/webkitgtk-sections.txt
@@ -351,6 +351,26 @@ WebKitWebPolicyDecisionPrivate
 </SECTION>
 
 <SECTION>
+<FILE>webkitgeolocationpolicydecision</FILE>
+<TITLE>WebKitGeolocationPolicyDecision</TITLE>
+WebKitGeolocationPolicyDecision
+webkit_geolocation_policy_allow
+webkit_geolocation_policy_deny
+webkit_geolocation_policy_decision_get_type
+<SUBSECTION Standard>
+WEBKIT_IS_GEOLOCATION_POLICY_DECISION
+WEBKIT_IS_GEOLOCATION_POLICY_DECISION_CLASS
+WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION
+WEBKIT_GEOLOCATION_POLICY_DECISION
+WEBKIT_GEOLOCATION_POLICY_DECISION_CLASS
+WEBKIT_GEOLOCATION_POLICY_DECISION_GET_CLASS
+<SUBSECTION Private>
+WebKitGeolocationPolicyDecision
+WebKitGeolocationPolicyDecisionClass
+WebKitGeolocationPolicyDecisionPrivate
+</SECTION>
+
+<SECTION>
 <FILE>webkitnetworkrequest</FILE>
 <TITLE>WebKitNetworkRequest</TITLE>
 WebKitNetworkRequest
-- 
cgit v1.1