[glib/gdbus-merge] Document DBUS address env vars

[Matthias Clasen <matthiasc src gnome org>]

commit d7095dd4700b38c202a43b7c21f93db20a9ede44
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue May 11 22:35:59 2010 -0400

    Document DBUS address env vars

 docs/reference/gio/overview.xml |   28 ++++++++++++++++++++++++++++
 gio/gdbusintrospection.c        |    2 +-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/docs/reference/gio/overview.xml b/docs/reference/gio/overview.xml
index 6b3339d..1a1ff02 100644
--- a/docs/reference/gio/overview.xml
+++ b/docs/reference/gio/overview.xml
@@ -296,6 +296,34 @@
     </formalpara>
 
    <formalpara>
+      <title><envar>DBUS_SYSTEM_ADDRESS</envar></title>
+
+      <para>
+        This variable is consulted to find the address of the D-Bus system
+        bus. For the format of D-Bus addresses, see the D-Bus
+        <ulink url="http://dbus.freedesktop.org/doc/dbus-specification.html#addresses";>specification</ulink>.
+      </para>
+   </formalpara>
+
+   <formalpara>
+      <title><envar>DBUS_SESSION_ADDRESS</envar></title>
+
+      <para>
+        This variable is consulted to find the address of the D-Bus session bus.
+      </para>
+   </formalpara>
+
+   <formalpara>
+      <title><envar>DBUS_STARTER_BUS_TYPE</envar></title>
+
+      <para>
+        This variable is consulted to find out the 'starter' bus for an
+        application that has been started via D-Bus activation. The possible
+        values are 'system' or 'session'.
+      </para>
+   </formalpara>
+
+   <formalpara>
       <title><envar>G_DBUS_DEBUG</envar></title>
 
       <para>
diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
index 7e461bd..c1c4d35 100644
--- a/gio/gdbusintrospection.c
+++ b/gio/gdbusintrospection.c
@@ -226,7 +226,7 @@ g_dbus_arg_info_ref (GDBusArgInfo *info)
 }
 
 /**
- * g_dbus_node_info_ref:
+ * g_dbus_annotation_info_ref:
  * @info: A #GDBusNodeInfo
  *
  * If @info is statically allocated does nothing. Otherwise increases