Merge branch 'gdbus-merge'

[platform/upstream/glib.git] / docs / reference / gio / gio-docs.xml

diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml
index c63f4f7..151e909 100644 (file)
--- a/docs/reference/gio/gio-docs.xml
+++ b/docs/reference/gio/gio-docs.xml
@@ -107,9 +107,11 @@
       <xi:include href="xml/gsocketcontrolmessage.xml"/>
       <xi:include href="xml/gunixfdlist.xml"/>
       <xi:include href="xml/gunixfdmessage.xml"/>
+      <xi:include href="xml/gcredentials.xml"/>
+      <xi:include href="xml/gunixcredentialsmessage.xml"/>
     </chapter>
     <chapter id="highlevel-socket">
-      <title>Highlevel network support</title>
+      <title>Highlevel network functionallity</title>
       <xi:include href="xml/gsocketclient.xml"/>
       <xi:include href="xml/gsocketconnection.xml"/>
       <xi:include href="xml/gunixconnection.xml"/>
@@ -125,6 +127,25 @@
       <xi:include href="xml/gnetworkservice.xml"/>
       <xi:include href="xml/gsrvtarget.xml"/>
     </chapter>
+    <chapter id="gdbus-lowlevel">
+      <title>Lowlevel D-Bus Support</title>
+      <xi:include href="xml/gdbusutils.xml"/>
+      <xi:include href="xml/gdbusaddress.xml"/>
+      <xi:include href="xml/gdbusintrospection.xml"/>
+      <xi:include href="xml/gdbuserror.xml"/>
+      <xi:include href="xml/gdbusmessage.xml"/>
+      <xi:include href="xml/gdbusconnection.xml"/>
+      <xi:include href="xml/gdbusmethodinvocation.xml"/>
+      <xi:include href="xml/gdbusserver.xml"/>
+      <xi:include href="xml/gdbusauthobserver.xml"/>
+    </chapter>
+    <chapter id="gdbus-convenience">
+      <title>Highlevel D-Bus Support</title>
+      <xi:include href="xml/gdbusnameowning.xml"/>
+      <xi:include href="xml/gdbusnamewatching.xml"/>
+      <xi:include href="xml/gdbusproxywatching.xml"/>
+      <xi:include href="xml/gdbusproxy.xml"/>
+    </chapter>
     <chapter id="utils">
         <title>Utilities</title>
         <xi:include href="xml/gfilenamecompleter.xml"/>
@@ -146,10 +167,17 @@
         <xi:include href="gsettings.xml"/>
         <xi:include href="glib-compile-schemas.xml"/>
         <xi:include href="gsettings-schema-convert.xml"/>
+        <xi:include href="gdbus.xml"/>
     </chapter>
   </part>
 
-  <xi:include href="xml/migrating.xml"/>
+  <part id="migrating">
+    <title>Migrating to GIO</title>
+    <xi:include href="xml/migrating-posix.xml"/>
+    <xi:include href="xml/migrating-gnome-vfs.xml"/>
+    <xi:include href="xml/migrating-gconf.xml"/>
+    <xi:include href="xml/migrating-gdbus.xml"/>
+  </part>
 
   <chapter id="gio-hierarchy">
     <title>Object Hierarchy</title>