From 8247ecc524267a06bf5ec3e3d3b7f4237e035416 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 8 Apr 2010 13:56:37 -0700
Subject: [PATCH] doc: fix libnm-glib doc generation

---
 docs/libnm-glib/Makefile.am          | 17 ++++++++------
 docs/libnm-glib/libnm-glib-docs.sgml | 35 ++++++++++++++++------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am
index 297722a46e..96ff66eee3 100644
--- a/docs/libnm-glib/Makefile.am
+++ b/docs/libnm-glib/Makefile.am
@@ -34,23 +34,26 @@ IGNORE_HFILES= \
 	nm-device-private.h \
 	nm-object-cache.h \
 	nm-object-private.h \
+	nm-remote-connection-private.h \
 	nm-types-private.h \
 	nm-access-point-bindings.h \
+	nm-active-connection-bindings.h \
 	nm-client-bindings.h \
 	nm-device-bindings.h \
+	nm-device-bt-bindings.h \
 	nm-device-ethernet-bindings.h \
 	nm-device-wifi-bindings.h \
-	nm-exported-connection-glue.h \
+	nm-dhcp4-config-bindings.h \
+	nm-dhcp6-config-bindings.h \
 	nm-exported-connection-bindings.h \
-	nm-settings-glue.h \
+	nm-exported-connection-glue.h \
+	nm-ip4-config-bindings.h \
+	nm-ip6-config-bindings.h \
 	nm-settings-bindings.h \
+	nm-settings-glue.h \
 	nm-settings-system-bindings.h \
 	nm-vpn-connection-bindings.h \
-	nm-vpn-plugin-glue.h \
-	nm-active-connection-bindings.h \
-	nm-ip4-config-bindings.h \
-	nm-dhcp4-config-bindings.h \
-	nm-ip4-config-bindings.h
+	nm-vpn-plugin-glue.h
 
 # Images to copy into HTML directory.
 HTML_IMAGES = 
diff --git a/docs/libnm-glib/libnm-glib-docs.sgml b/docs/libnm-glib/libnm-glib-docs.sgml
index 8fe5a1d43a..0ea21102ee 100644
--- a/docs/libnm-glib/libnm-glib-docs.sgml
+++ b/docs/libnm-glib/libnm-glib-docs.sgml
@@ -5,35 +5,40 @@
   <bookinfo>
     <title>libnm-glib Reference Manual</title>
     <releaseinfo>
-      for libnm-glib [VERSION]
+      for libnm-glib 0.8
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://[SERVER]/libnm-glib/index.html">http://[SERVER]/libnm-glib/</ulink>.
+      <ulink role="online-location" url="http://projects.gnome.org/NetworkManager/developers/libnm-glib/08/">http://projects.gnome.org/NetworkManager/developers/libnm-glib/08/</ulink>.
     </releaseinfo>
   </bookinfo>
 
   <chapter>
-    <title>[Insert title here]</title>
+    <title>libnm-glib Objects</title>
     <xi:include href="xml/nm-access-point.xml"/>
+    <xi:include href="xml/nm-active-connection.xml"/>
     <xi:include href="xml/nm-cdma-device.xml"/>
     <xi:include href="xml/nm-client.xml"/>
-    <xi:include href="xml/nm-gsm-device.xml"/>
+    <xi:include href="xml/nm-device-bt.xml"/>
     <xi:include href="xml/nm-device.xml"/>
+    <xi:include href="xml/nm-device-ethernet.xml"/>
+    <xi:include href="xml/nm-device-wifi.xml"/>
+    <xi:include href="xml/nm-dhcp4-config.xml"/>
+    <xi:include href="xml/nm-dhcp6-config.xml"/>
+    <xi:include href="xml/nm-exported-connection.xml"/>
+    <xi:include href="xml/nm-gsm-device.xml"/>
     <xi:include href="xml/nm-ip4-config.xml"/>
     <xi:include href="xml/nm-ip6-config.xml"/>
     <xi:include href="xml/nm-object.xml"/>
-    <xi:include href="xml/nm-settings.xml"/>
+    <xi:include href="xml/nm-remote-connection.xml"/>
+    <xi:include href="xml/nm-remote-settings.xml"/>
+    <xi:include href="xml/nm-remote-settings-system.xml"/>
+    <xi:include href="xml/nm-serial-device.xml"/>
+    <xi:include href="xml/nm-settings-connection-interface.xml"/>
+    <xi:include href="xml/nm-settings-interface.xml"/>
+    <xi:include href="xml/nm-settings-service.xml"/>
+    <xi:include href="xml/nm-settings-system-interface.xml"/>
+    <xi:include href="xml/nm-types.xml"/>
     <xi:include href="xml/nm-vpn-connection.xml"/>
     <xi:include href="xml/nm-vpn-plugin.xml"/>
-    <xi:include href="xml/nm-dbus-settings-system.xml"/>
-    <xi:include href="xml/nm-active-connection.xml"/>
-    <xi:include href="xml/nm-device-ethernet.xml"/>
-    <xi:include href="xml/nm-device-wifi.xml"/>
-    <xi:include href="xml/nm-dbus-connection.xml"/>
-    <xi:include href="xml/nm-serial-device.xml"/>
-    <xi:include href="xml/nm-dbus-settings.xml"/>
-    <xi:include href="xml/nm-dhcp4-config.xml"/>
     <xi:include href="xml/nm-vpn-plugin-ui-interface.xml"/>
-    <xi:include href="xml/libnm_glib.xml"/>
-    <xi:include href="xml/nm-types.xml"/>
   </chapter>
 </book>