Fix up docs

3 files changed, 48 insertions, 21 deletions

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 7893532c..441fdbff 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -35,7 +35,7 @@ IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \
 	soup-connection.h soup-connection-ntlm.h \
 	soup-dns.h soup-auth-manager.h soup-auth-manager-ntlm.h \
 	soup-message-queue.h soup-path-map.h soup-ssl.h \
-	soup-proxy-resolver-libproxy.h soup-proxy-resolver-gconf.h \
+	soup-proxy-resolver.h soup-proxy-resolver-gnome.h \
 	soup-proxy-resolver-static.h
 
 # Images to copy into HTML directory.
diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
index aef4d9d3..3cb3d116 100644
--- a/docs/reference/libsoup-2.4-docs.sgml
+++ b/docs/reference/libsoup-2.4-docs.sgml
@@ -21,26 +21,31 @@
     <xi:include href="xml/soup-auth-domain-basic.xml"/>
     <xi:include href="xml/soup-auth-domain-digest.xml"/>
     <xi:include href="xml/soup-cookie.xml"/>
-    <xi:include href="xml/soup-cookie-jar.xml"/>
-    <xi:include href="xml/soup-cookie-jar-text.xml"/>
-    <xi:include href="xml/soup-logger.xml"/>
     <xi:include href="xml/soup-message.xml"/>
     <xi:include href="xml/soup-message-headers.xml"/>
     <xi:include href="xml/soup-message-body.xml"/>
     <xi:include href="xml/soup-method.xml"/>
     <xi:include href="xml/soup-multipart.xml"/>
-    <xi:include href="xml/soup-proxy-resolver.xml"/>
     <xi:include href="xml/soup-server.xml"/>
     <xi:include href="xml/soup-session.xml"/>
     <xi:include href="xml/soup-session-async.xml"/>
     <xi:include href="xml/soup-session-sync.xml"/>
-    <xi:include href="xml/soup-session-feature.xml"/>
     <xi:include href="xml/soup-status.xml"/>
     <xi:include href="xml/soup-uri.xml"/>
     <xi:include href="xml/soup-misc.xml"/>
   </chapter>
 
   <chapter>
+    <title>Additional Features</title>
+    <xi:include href="xml/soup-session-feature.xml"/>
+    <xi:include href="xml/soup-content-sniffer.xml"/>
+    <xi:include href="xml/soup-cookie-jar.xml"/>
+    <xi:include href="xml/soup-cookie-jar-text.xml"/>
+    <xi:include href="xml/soup-logger.xml"/>
+    <xi:include href="xml/soup-proxy-uri-resolver.xml"/>
+  </chapter>
+
+  <chapter>
     <title>Web Services APIs</title>
     <xi:include href="xml/soup-forms.xml"/>
     <xi:include href="xml/soup-xmlrpc.xml"/>
diff --git a/docs/reference/libsoup-2.4-sections.txt b/docs/reference/libsoup-2.4-sections.txt
index 66b16440..77f89c90 100644
--- a/docs/reference/libsoup-2.4-sections.txt
+++ b/docs/reference/libsoup-2.4-sections.txt
@@ -28,6 +28,8 @@ soup_message_get_flags
 SoupChunkAllocator
 soup_message_set_chunk_allocator
 <SUBSECTION>
+soup_message_disable_feature
+<SUBSECTION>
 SOUP_MESSAGE_METHOD
 SOUP_MESSAGE_URI
 SOUP_MESSAGE_HTTP_VERSION
@@ -52,6 +54,7 @@ soup_message_wrote_body_data
 soup_message_wrote_body
 soup_message_got_informational
 soup_message_got_headers
+soup_message_content_sniffed
 soup_message_got_chunk
 soup_message_got_body
 soup_message_finished
@@ -380,8 +383,9 @@ soup_session_add_feature
 soup_session_add_feature_by_type
 soup_session_remove_feature
 soup_session_remove_feature_by_type
-soup_session_get_feature
 soup_session_get_features
+soup_session_get_feature
+soup_session_get_feature_for_message
 <SUBSECTION>
 SOUP_SESSION_PROXY_URI
 SOUP_SESSION_MAX_CONNS
@@ -844,21 +848,21 @@ soup_cookie_jar_sqlite_get_type
 </SECTION>
 
 <SECTION>
-<FILE>soup-proxy-resolver</FILE>
-<TITLE>SoupProxyResolver</TITLE>
-SoupProxyResolver
-SoupProxyResolverCallback
-soup_proxy_resolver_get_proxy_async
-soup_proxy_resolver_get_proxy_sync
+<FILE>soup-proxy-uri-resolver</FILE>
+<TITLE>SoupProxyURIResolver</TITLE>
+SoupProxyURIResolver
+SoupProxyURIResolverCallback
+soup_proxy_uri_resolver_get_proxy_uri_async
+soup_proxy_uri_resolver_get_proxy_uri_sync
 <SUBSECTION Standard>
-SoupProxyResolverInterface
-SOUP_PROXY_RESOLVER
-SOUP_PROXY_RESOLVER_CLASS
-SOUP_PROXY_RESOLVER_GET_CLASS
-SOUP_TYPE_PROXY_RESOLVER
-SOUP_IS_PROXY_RESOLVER
-SOUP_IS_PROXY_RESOLVER_CLASS
-soup_proxy_resolver_get_type
+SoupProxyURIResolverInterface
+SOUP_IS_PROXY_URI_RESOLVER
+SOUP_IS_PROXY_URI_RESOLVER_CLASS
+SOUP_PROXY_URI_RESOLVER
+SOUP_PROXY_URI_RESOLVER_CLASS
+SOUP_PROXY_URI_RESOLVER_GET_CLASS
+SOUP_TYPE_PROXY_URI_RESOLVER
+soup_proxy_uri_resolver_get_type
 </SECTION>
 
 <SECTION>
@@ -869,3 +873,21 @@ SOUP_TYPE_PROXY_RESOLVER_GNOME
 soup_proxy_resolver_gnome_get_type
 soup_gnome_features_2_26_get_type
 </SECTION>
+
+<SECTION>
+<FILE>soup-content-sniffer</FILE>
+<TITLE>SoupContentSniffer</TITLE>
+SoupContentSniffer
+soup_content_sniffer_new
+soup_content_sniffer_sniff
+<SUBSECTION Standard>
+SOUP_CONTENT_SNIFFER
+SOUP_CONTENT_SNIFFER_CLASS
+SOUP_CONTENT_SNIFFER_GET_CLASS
+SOUP_IS_CONTENT_SNIFFER
+SOUP_IS_CONTENT_SNIFFER_CLASS
+SOUP_TYPE_CONTENT_SNIFFER
+SoupContentSnifferClass
+SoupContentSnifferPrivate
+soup_content_sniffer_get_type
+</SECTION>