Imported Upstream version 1.7.10upstream/1.7.10

3 files changed, 430 insertions, 287 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index e58e7693..89d952da 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -54,13 +81,13 @@ host_triplet = @host@
 @DBUS_XML_DOCS_ENABLED_TRUE@am__append_1 = $(XMLTO_HTML)
 @DBUS_DOXYGEN_DOCS_ENABLED_TRUE@@DBUS_HAVE_XSLTPROC_TRUE@am__append_2 = dbus.devhelp
 subdir = doc
-DIST_COMMON = $(dist_doc_DATA) $(dist_html_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/dbus-cleanup-sockets.1.xml.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/dbus-cleanup-sockets.1.xml.in \
 	$(srcdir)/dbus-daemon.1.xml.in $(srcdir)/dbus-launch.1.xml.in \
 	$(srcdir)/dbus-monitor.1.xml.in \
 	$(srcdir)/dbus-run-session.1.xml.in \
 	$(srcdir)/dbus-send.1.xml.in $(srcdir)/dbus-uuidgen.1.xml.in \
-	TODO
+	$(dist_doc_DATA) $(dist_html_DATA) TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \
 	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -77,12 +104,18 @@ CONFIG_CLEAN_FILES = dbus-cleanup-sockets.1.xml dbus-daemon.1.xml \
 	dbus-launch.1.xml dbus-monitor.1.xml dbus-run-session.1.xml \
 	dbus-send.1.xml dbus-uuidgen.1.xml
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -123,6 +156,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)" \
 NROFF = nroff
 MANS = $(man1_MANS)
 DATA = $(dist_doc_DATA) $(dist_html_DATA) $(html_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADT_LIBS = @ADT_LIBS@
@@ -557,27 +591,14 @@ uninstall-htmlDATA:
 	@list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -721,20 +742,20 @@ uninstall-man: uninstall-man1
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dist_docDATA install-dist_htmlDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-htmlDATA install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_docDATA uninstall-dist_htmlDATA \
-	uninstall-htmlDATA uninstall-local uninstall-man \
-	uninstall-man1
+	clean-libtool clean-local cscopelist-am ctags-am distclean \
+	distclean-generic distclean-libtool distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-dist_docDATA \
+	install-dist_htmlDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-htmlDATA \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-dist_docDATA \
+	uninstall-dist_htmlDATA uninstall-htmlDATA uninstall-local \
+	uninstall-man uninstall-man1
 
 
 @DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml
diff --git a/doc/dbus-daemon.1.xml.in b/doc/dbus-daemon.1.xml.in
index 1a1e42cd..7b7f4a1b 100644
--- a/doc/dbus-daemon.1.xml.in
+++ b/doc/dbus-daemon.1.xml.in
@@ -392,12 +392,13 @@ DBUS_SESSION_BUS_ADDRESS is set.</para>
 <para>Example: &lt;listen&gt;tcp:host=localhost,port=0&lt;/listen&gt;</para>
 
 
-<para>tcp addresses also allow a bind=hostname option, which will override
-the host option specifying what address to bind to, without changing
-the address reported by the bus. The bind option can also take a
-special name '*' to cause the bus to listen on all local address
-(INADDR_ANY). The specified host should be a valid name of the local
-machine or weird stuff will happen.</para>
+<para>tcp/nonce-tcp addresses also allow a bind=hostname option,
+used in a listenable address to configure the interface on which
+the server will listen: either the hostname is the IP address of
+one of the local machine's interfaces (most commonly 127.0.0.1),
+or a DNS name that resolves to one of those IP addresses, or '*'
+to listen on all interfaces simultaneously.  If not specified,
+the default is the same value as "host".</para>
 
 
 <para>Example: &lt;listen&gt;tcp:host=localhost,bind=*,port=0&lt;/listen&gt;</para>
diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index bc374b9b..8b83495f 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -6,48 +6,48 @@
 <article id="index">
   <articleinfo>
     <title>D-Bus Specification</title>
-    <releaseinfo>Version 0.22</releaseinfo>
-    <date>2013-10-09</date>
+    <releaseinfo>Version 0.23</releaseinfo>
+    <date>2014-01-06</date>
     <authorgroup>
       <author>
-	<firstname>Havoc</firstname>
-	<surname>Pennington</surname>
-	<affiliation>
-	  <orgname>Red Hat, Inc.</orgname>
-	  <address>
-	    <email>hp@pobox.com</email>
-	  </address>
-	</affiliation>
+        <firstname>Havoc</firstname>
+        <surname>Pennington</surname>
+        <affiliation>
+          <orgname>Red Hat, Inc.</orgname>
+          <address>
+            <email>hp@pobox.com</email>
+          </address>
+        </affiliation>
       </author>
       <author>
-	<firstname>Anders</firstname>
-	<surname>Carlsson</surname>
-	<affiliation>
-	  <orgname>CodeFactory AB</orgname>
-	  <address>
+        <firstname>Anders</firstname>
+        <surname>Carlsson</surname>
+        <affiliation>
+          <orgname>CodeFactory AB</orgname>
+          <address>
             <email>andersca@codefactory.se</email>
           </address>
-	</affiliation>
+        </affiliation>
       </author>
       <author>
-	<firstname>Alexander</firstname>
-	<surname>Larsson</surname>
-	<affiliation>
-	  <orgname>Red Hat, Inc.</orgname>
-	  <address>
+        <firstname>Alexander</firstname>
+        <surname>Larsson</surname>
+        <affiliation>
+          <orgname>Red Hat, Inc.</orgname>
+          <address>
             <email>alexl@redhat.com</email>
           </address>
-	</affiliation>
+        </affiliation>
       </author>
       <author>
-	<firstname>Sven</firstname>
-	<surname>Herzberg</surname>
-	<affiliation>
-	  <orgname>Imendio AB</orgname>
-	  <address>
+        <firstname>Sven</firstname>
+        <surname>Herzberg</surname>
+        <affiliation>
+          <orgname>Imendio AB</orgname>
+          <address>
             <email>sven@imendio.com</email>
           </address>
-	</affiliation>
+        </affiliation>
       </author>
       <author>
         <firstname>Simon</firstname>
@@ -72,6 +72,16 @@
     </authorgroup>
    <revhistory>
      <revision>
+       <revnumber>0.23</revnumber>
+       <date>2014-01-06</date>
+       <authorinitials>SMcV, CY</authorinitials>
+       <revremark>
+         method call messages with no INTERFACE may be considered an error;
+         document tcp:bind=... and nonce-tcp:bind=...; define listenable
+         and connectable addresses
+       </revremark>
+     </revision>
+     <revision>
        <revnumber>0.22</revnumber>
        <date>2013-10-09</date>
        <authorinitials></authorinitials>
@@ -757,14 +767,14 @@
                 <entry>0 (ASCII NUL)</entry>
                 <entry>Not a valid type code, used to terminate signatures</entry>
               </row><row>
-		<entry><literal>BYTE</literal></entry>
-		<entry>121 (ASCII 'y')</entry>
-		<entry>8-bit unsigned integer</entry>
+                <entry><literal>BYTE</literal></entry>
+                <entry>121 (ASCII 'y')</entry>
+                <entry>8-bit unsigned integer</entry>
+              </row><row>
+                <entry><literal>BOOLEAN</literal></entry>
+                <entry>98 (ASCII 'b')</entry>
+                <entry>Boolean value, 0 is <literal>FALSE</literal> and 1 is <literal>TRUE</literal>. Everything else is invalid.</entry>
               </row><row>
-		<entry><literal>BOOLEAN</literal></entry>
-		<entry>98 (ASCII 'b')</entry>
-		<entry>Boolean value, 0 is <literal>FALSE</literal> and 1 is <literal>TRUE</literal>. Everything else is invalid.</entry>
-	      </row><row>
                 <entry><literal>INT16</literal></entry>
                 <entry>110 (ASCII 'n')</entry>
                 <entry>16-bit signed integer</entry>
@@ -772,7 +782,7 @@
                 <entry><literal>UINT16</literal></entry>
                 <entry>113 (ASCII 'q')</entry>
                 <entry>16-bit unsigned integer</entry>
-	      </row><row>
+              </row><row>
                 <entry><literal>INT32</literal></entry>
                 <entry>105 (ASCII 'i')</entry>
                 <entry>32-bit signed integer</entry>
@@ -780,7 +790,7 @@
                 <entry><literal>UINT32</literal></entry>
                 <entry>117 (ASCII 'u')</entry>
                 <entry>32-bit unsigned integer</entry>
-	      </row><row>
+              </row><row>
                 <entry><literal>INT64</literal></entry>
                 <entry>120 (ASCII 'x')</entry>
                 <entry>64-bit signed integer</entry>
@@ -1101,7 +1111,7 @@
                 <entry>
                   8
                 </entry>
-	      </row><row>
+              </row><row>
                 <entry><literal>VARIANT</literal></entry>
                 <entry>
                   The marshaled <literal>SIGNATURE</literal> of a single
@@ -1111,7 +1121,7 @@
                 <entry>
                   1 (alignment of the signature)
                 </entry>
-	      </row><row>
+              </row><row>
                 <entry><literal>DICT_ENTRY</literal></entry>
                 <entry>
                   Identical to STRUCT.
@@ -1128,7 +1138,7 @@
                 file descriptor in the array of file descriptors that
                 accompany the message.</entry>
                 <entry>4</entry>
-	      </row>
+              </row>
             </tbody>
           </tgroup>
         </informaltable>
@@ -1520,12 +1530,12 @@
                 </para>
             </listitem>
 
-	    <listitem><para>Interface names must contain at least one '.' (period)
+            <listitem><para>Interface names must contain at least one '.' (period)
               character (and thus at least two elements).
               </para></listitem>
 
-	    <listitem><para>Interface names must not begin with a '.' (period) character.</para></listitem>
-	    <listitem><para>Interface names must not exceed the maximum name length.</para></listitem>
+            <listitem><para>Interface names must not begin with a '.' (period) character.</para></listitem>
+            <listitem><para>Interface names must not exceed the maximum name length.</para></listitem>
           </itemizedlist>
         </para>
 
@@ -1584,12 +1594,12 @@
                 </para>
             </listitem>
 
-	    <listitem><para>Bus names must contain at least one '.' (period)
+            <listitem><para>Bus names must contain at least one '.' (period)
               character (and thus at least two elements).
               </para></listitem>
 
-	    <listitem><para>Bus names must not begin with a '.' (period) character.</para></listitem>
-	    <listitem><para>Bus names must not exceed the maximum name length.</para></listitem>
+            <listitem><para>Bus names must not begin with a '.' (period) character.</para></listitem>
+            <listitem><para>Bus names must not exceed the maximum name length.</para></listitem>
           </itemizedlist>
         </para>
         <para>
@@ -1627,12 +1637,12 @@
         <para>
           Member (i.e. method or signal) names:
           <itemizedlist>
-	    <listitem><para>Must only contain the ASCII characters
+            <listitem><para>Must only contain the ASCII characters
                 "[A-Z][a-z][0-9]_" and may not begin with a
                 digit.</para></listitem>
-	    <listitem><para>Must not contain the '.' (period) character.</para></listitem>
-	    <listitem><para>Must not exceed the maximum name length.</para></listitem>
-	    <listitem><para>Must be at least 1 byte in length.</para></listitem>
+            <listitem><para>Must not contain the '.' (period) character.</para></listitem>
+            <listitem><para>Must not exceed the maximum name length.</para></listitem>
+            <listitem><para>Must be at least 1 byte in length.</para></listitem>
           </itemizedlist>
         </para>
 
@@ -1680,12 +1690,25 @@
         <para>
           A method call message is required to have a <literal>MEMBER</literal> header field
           indicating the name of the method. Optionally, the message has an
-          <literal>INTERFACE</literal> field giving the interface the method is a part of. In the
-          absence of an <literal>INTERFACE</literal> field, if two interfaces on the same object have
-          a method with the same name, it is undefined which of the two methods
-          will be invoked. Implementations may also choose to return an error in
-          this ambiguous case. However, if a method name is unique
-          implementations must not require an interface field.
+          <literal>INTERFACE</literal> field giving the interface the method is a part of.
+          Including the <literal>INTERFACE</literal> in all method call
+          messages is strongly recommended.
+        </para>
+        <para>
+          In the absence of an <literal>INTERFACE</literal> field, if two
+          or more interfaces on the same object have a method with the same
+          name, it is undefined which of those methods will be invoked.
+          Implementations may choose to either return an error, or deliver the
+          message as though it had an arbitrary one of those interfaces.
+        </para>
+        <para>
+          In some situations (such as the well-known system bus), messages
+          are filtered through an access-control list external to the
+          remote object implementation. If that filter rejects certain
+          messages by matching their interface, or accepts only messages
+          to specific interfaces, it must also reject messages that have no
+          <literal>INTERFACE</literal>: otherwise, malicious
+          applications could use this to bypass the filter.
         </para>
         <para>
           Method call messages also include a <literal>PATH</literal> field
@@ -1963,23 +1986,23 @@
         Commands from the client to the server are as follows:
 
         <itemizedlist>
-	  <listitem><para>AUTH [mechanism] [initial-response]</para></listitem>
-	  <listitem><para>CANCEL</para></listitem>
-	  <listitem><para>BEGIN</para></listitem>
-	  <listitem><para>DATA &lt;data in hex encoding&gt;</para></listitem>
-	  <listitem><para>ERROR [human-readable error explanation]</para></listitem>
-	  <listitem><para>NEGOTIATE_UNIX_FD</para></listitem>
-	</itemizedlist>
+          <listitem><para>AUTH [mechanism] [initial-response]</para></listitem>
+          <listitem><para>CANCEL</para></listitem>
+          <listitem><para>BEGIN</para></listitem>
+          <listitem><para>DATA &lt;data in hex encoding&gt;</para></listitem>
+          <listitem><para>ERROR [human-readable error explanation]</para></listitem>
+          <listitem><para>NEGOTIATE_UNIX_FD</para></listitem>
+        </itemizedlist>
 
         From server to client are as follows:
 
         <itemizedlist>
-	  <listitem><para>REJECTED &lt;space-separated list of mechanism names&gt;</para></listitem>
-	  <listitem><para>OK &lt;GUID in hex&gt;</para></listitem>
-	  <listitem><para>DATA &lt;data in hex encoding&gt;</para></listitem>
-	  <listitem><para>ERROR</para></listitem>
-	  <listitem><para>AGREE_UNIX_FD</para></listitem>
-	</itemizedlist>
+          <listitem><para>REJECTED &lt;space-separated list of mechanism names&gt;</para></listitem>
+          <listitem><para>OK &lt;GUID in hex&gt;</para></listitem>
+          <listitem><para>DATA &lt;data in hex encoding&gt;</para></listitem>
+          <listitem><para>ERROR</para></listitem>
+          <listitem><para>AGREE_UNIX_FD</para></listitem>
+        </itemizedlist>
       </para>
       <para>
         Unofficial extensions to the command set must begin with the letters 
@@ -2209,18 +2232,18 @@
       
       <para>
         <figure>
-	  <title>Example of successful magic cookie authentication</title>
-	  <programlisting>
+          <title>Example of successful magic cookie authentication</title>
+          <programlisting>
             (MAGIC_COOKIE is a made up mechanism)
 
             C: AUTH MAGIC_COOKIE 3138363935333137393635383634
             S: OK 1234deadbeef
             C: BEGIN
           </programlisting>
-	</figure>
+        </figure>
         <figure>
-	  <title>Example of finding out mechanisms then picking one</title>
-	  <programlisting>
+          <title>Example of finding out mechanisms then picking one</title>
+          <programlisting>
             C: AUTH
             S: REJECTED KERBEROS_V4 SKEY
             C: AUTH SKEY 7ab83f32ee
@@ -2229,20 +2252,20 @@
             S: OK 1234deadbeef
             C: BEGIN
           </programlisting>
-	</figure>
+        </figure>
         <figure>
-	  <title>Example of client sends unknown command then falls back to regular auth</title>
-	  <programlisting>
+          <title>Example of client sends unknown command then falls back to regular auth</title>
+          <programlisting>
             C: FOOBAR
             S: ERROR
             C: AUTH MAGIC_COOKIE 3736343435313230333039
             S: OK 1234deadbeef
             C: BEGIN
           </programlisting>
-	</figure>
+        </figure>
         <figure>
-	  <title>Example of server doesn't support initial auth mechanism</title>
-	  <programlisting>
+          <title>Example of server doesn't support initial auth mechanism</title>
+          <programlisting>
             C: AUTH MAGIC_COOKIE 3736343435313230333039
             S: REJECTED KERBEROS_V4 SKEY
             C: AUTH SKEY 7ab83f32ee
@@ -2251,10 +2274,10 @@
             S: OK 1234deadbeef
             C: BEGIN
           </programlisting>
-	</figure>
+        </figure>
         <figure>
-	  <title>Example of wrong password or the like followed by successful retry</title>
-	  <programlisting>
+          <title>Example of wrong password or the like followed by successful retry</title>
+          <programlisting>
             C: AUTH MAGIC_COOKIE 3736343435313230333039
             S: REJECTED KERBEROS_V4 SKEY
             C: AUTH SKEY 7ab83f32ee
@@ -2267,10 +2290,10 @@
             S: OK 1234deadbeef
             C: BEGIN
           </programlisting>
-	</figure>
+        </figure>
         <figure>
-	  <title>Example of skey cancelled and restarted</title>
-	  <programlisting>
+          <title>Example of skey cancelled and restarted</title>
+          <programlisting>
             C: AUTH MAGIC_COOKIE 3736343435313230333039
             S: REJECTED KERBEROS_V4 SKEY
             C: AUTH SKEY 7ab83f32ee
@@ -2283,10 +2306,10 @@
             S: OK 1234deadbeef
             C: BEGIN
           </programlisting>
-	</figure>
+        </figure>
         <figure>
-	  <title>Example of successful magic cookie authentication with successful negotiation of Unix FD passing</title>
-	  <programlisting>
+          <title>Example of successful magic cookie authentication with successful negotiation of Unix FD passing</title>
+          <programlisting>
             (MAGIC_COOKIE is a made up mechanism)
 
             C: AUTH MAGIC_COOKIE 3138363935333137393635383634
@@ -2295,10 +2318,10 @@
             S: AGREE_UNIX_FD
             C: BEGIN
           </programlisting>
-	</figure>
+        </figure>
         <figure>
-	  <title>Example of successful magic cookie authentication with unsuccessful negotiation of Unix FD passing</title>
-	  <programlisting>
+          <title>Example of successful magic cookie authentication with unsuccessful negotiation of Unix FD passing</title>
+          <programlisting>
             (MAGIC_COOKIE is a made up mechanism)
 
             C: AUTH MAGIC_COOKIE 3138363935333137393635383634
@@ -2307,7 +2330,7 @@
             S: ERROR
             C: BEGIN
           </programlisting>
-	</figure>
+        </figure>
       </para>
     </sect2>
     <sect2 id="auth-states">
@@ -2930,6 +2953,35 @@
       <programlisting>unix:path=/tmp/dbus-test;unix:path=/tmp/dbus-test2</programlisting>
     </para>
 
+    <para>
+      Some addresses are <firstterm>connectable</firstterm>. A connectable
+      address is one containing enough information for a client to connect
+      to it. For instance, <literal>tcp:host=127.0.0.1,port=4242</literal>
+      is a connectable address. It is not necessarily possible to listen
+      on every connectable address: for instance, it is not possible to
+      listen on a <literal>unixexec:</literal> address.
+    </para>
+
+    <para>
+      Some addresses are <firstterm>listenable</firstterm>. A listenable
+      address is one containing enough information for a server to listen on
+      it, producing a connectable address (which may differ from the
+      original address). Many listenable addresses are not connectable:
+      for instance, <literal>tcp:host=127.0.0.1</literal>
+      is listenable, but not connectable (because it does not specify
+      a port number).
+    </para>
+
+    <para>
+      Listening on an address that is not connectable will result in a
+      connectable address that is not the same as the listenable address.
+      For instance, listening on <literal>tcp:host=127.0.0.1</literal>
+      might result in the connectable address
+      <literal>tcp:host=127.0.0.1,port=30958</literal>,
+      or listening on <literal>unix:tmpdir=/tmp</literal>
+      might result in the connectable address
+      <literal>unix:abstract=/tmp/dbus-U8OSdmf7</literal>.
+    </para>
   </sect1>
   
   <sect1 id="transports">
@@ -2947,21 +2999,28 @@
       <title>Unix Domain Sockets</title>
       <para>
         Unix domain sockets can be either paths in the file system or on Linux 
-	kernels, they can be abstract which are similar to paths but
-	do not show up in the file system.  
+        kernels, they can be abstract which are similar to paths but
+        do not show up in the file system.
       </para>
 
       <para>
         When a socket is opened by the D-Bus library it truncates the path 
-	name right before the first trailing Nul byte.  This is true for both
-	normal paths and abstract paths.  Note that this is a departure from
-	previous versions of D-Bus that would create sockets with a fixed 
-	length path name.  Names which were shorter than the fixed length
-	would be padded by Nul bytes.
+        name right before the first trailing Nul byte.  This is true for both
+        normal paths and abstract paths.  Note that this is a departure from
+        previous versions of D-Bus that would create sockets with a fixed
+        length path name.  Names which were shorter than the fixed length
+        would be padded by Nul bytes.
       </para>
       <para>
         Unix domain sockets are not available on Windows.
       </para>
+      <para>
+        Unix addresses that specify <literal>path</literal> or
+        <literal>abstract</literal> are both listenable and connectable.
+        Unix addresses that specify <literal>tmpdir</literal> are only
+        listenable: the corresponding connectable address will specify
+        either <literal>path</literal> or <literal>abstract</literal>.
+      </para>
       <sect3 id="transports-unix-domain-sockets-addresses">
         <title>Server Address Format</title>
         <para> 
@@ -2991,11 +3050,16 @@
           <row>
             <entry>abstract</entry>
             <entry>(string)</entry>
-            <entry>unique string (path) in the abstract namespace. If set, the "path" or "tempdir" key must not be set.</entry>
+            <entry>unique string (path) in the abstract namespace. If set, the "path" or "tmpdir" key must not be set. This key is only supported on platforms with "abstract Unix sockets", of which Linux is the only known example.</entry>
           </row>
         </tbody>
         </tgroup>
        </informaltable>
+       <para>
+         Exactly one of the keys <literal>path</literal>,
+         <literal>abstract</literal> or
+         <literal>tmpdir</literal> must be provided.
+       </para>
       </sect3>
     </sect2>
     <sect2 id="transports-launchd">
@@ -3019,6 +3083,9 @@
       <para>
         launchd is not available on Microsoft Windows.
       </para>
+      <para>
+        launchd addresses are listenable and connectable.
+      </para>
       <sect3 id="transports-launchd-addresses">
         <title>Server Address Format</title>
         <para>
@@ -3043,6 +3110,9 @@
         </tbody>
         </tgroup>
        </informaltable>
+       <para>
+         The <literal>env</literal> key is required.
+       </para>
       </sect3>
     </sect2>
     <sect2 id="transports-systemd">
@@ -3065,6 +3135,11 @@
       <para>
         The systemd transport defines no parameter keys.
       </para>
+      <para>
+        systemd addresses are listenable, but not connectable. The
+        corresponding connectable address is the <literal>unix</literal>
+        or <literal>tcp</literal> address of the socket.
+      </para>
     </sect2>
     <sect2 id="transports-tcp-sockets">
       <title>TCP Sockets</title>
@@ -3077,9 +3152,16 @@
         over a network is unsecure. 
       </para>
       <para>  
-        Windows notes: Because of the tcp stack on Windows does not provide sending
-        credentials over a tcp connection, the EXTERNAL authentification 
-        mechanismus does not work. 
+        On Windows and most Unix platforms, the TCP stack is unable to transfer
+        credentials over a TCP connection, so the EXTERNAL authentication
+        mechanism does not work for this transport.
+      </para>
+      <para>
+        All <literal>tcp</literal> addresses are listenable.
+        <literal>tcp</literal> addresses in which both
+        <literal>host</literal> and <literal>port</literal> are
+        specified, and <literal>port</literal> is non-zero,
+        are also connectable.
       </para>
       <sect3 id="transports-tcp-sockets-addresses">
         <title>Server Address Format</title>
@@ -3100,7 +3182,18 @@
            <row>
             <entry>host</entry>
             <entry>(string)</entry>
-            <entry>dns name or ip address</entry>
+            <entry>DNS name or IP address</entry>
+          </row>
+          <row>
+           <entry>bind</entry>
+           <entry>(string)</entry>
+           <entry>Used in a listenable address to configure the interface
+            on which the server will listen: either the IP address of one of
+            the local machine's interfaces (most commonly <literal>127.0.0.1
+            </literal>), or a DNS name that resolves to one of those IP
+            addresses, or '*' to listen on all interfaces simultaneously.
+            If not specified, the default is the same value as "host".
+           </entry>
           </row>
           <row>
            <entry>port</entry>
@@ -3151,6 +3244,12 @@
         key-value pair and send it over the socket. After that, the
         transport behaves like an unsecured tcp transport.
       </para>
+      <para>
+        All nonce-tcp addresses are listenable. nonce-tcp addresses in which
+        <literal>host</literal>, <literal>port</literal> and
+        <literal>noncefile</literal> are all specified,
+        and <literal>port</literal> is nonzero, are also connectable.
+      </para>
       <sect3 id="transports-nonce-tcp-sockets-addresses">
         <title>Server Address Format</title>
         <para> 
@@ -3170,7 +3269,13 @@
            <row>
             <entry>host</entry>
             <entry>(string)</entry>
-            <entry>dns name or ip address</entry>
+            <entry>DNS name or IP address</entry>
+          </row>
+          <row>
+           <entry>bind</entry>
+           <entry>(string)</entry>
+           <entry>The same as for tcp: addresses
+           </entry>
           </row>
           <row>
            <entry>port</entry>
@@ -3188,7 +3293,10 @@
           <row>
            <entry>noncefile</entry>
            <entry>(path)</entry>
-           <entry>file location containing the secret</entry>
+           <entry>File location containing the secret.
+             This is only meaningful in connectable addresses:
+             a listening D-Bus server that offers this transport
+             will always create a new nonce file.</entry>
           </row>
          </tbody>
         </tgroup>
@@ -3211,6 +3319,10 @@
       <para>
         Executed subprocesses are not available on Windows.
       </para>
+      <para>
+        <literal>unixexec</literal> addresses are connectable, but are not
+        listenable.
+      </para>
       <sect3 id="transports-exec-addresses">
         <title>Server Address Format</title>
         <para>
@@ -3269,6 +3381,15 @@
      <para>The autolaunch transport provides a way for dbus clients to autodetect
        a running dbus session bus and to autolaunch a session bus if not present.
      </para>
+      <para>
+        On Unix, <literal>autolaunch</literal> addresses are connectable,
+        but not listenable.
+      </para>
+      <para>
+        On Windows, <literal>autolaunch</literal> addresses are both
+        connectable and listenable.
+      </para>
+
      <sect3 id="meta-transports-autolaunch-addresses">
        <title>Server Address Format</title>
        <para>
@@ -3744,38 +3865,38 @@
     <para>
         Method, interface, property, and signal elements may have
         "annotations", which are generic key/value pairs of metadata.
-	They are similar conceptually to Java's annotations and C# attributes.
+        They are similar conceptually to Java's annotations and C# attributes.
         Well-known annotations:
      </para>
      <informaltable>
        <tgroup cols="3">
-	 <thead>
-	   <row>
-	     <entry>Name</entry>
-	     <entry>Values (separated by ,)</entry>
-	     <entry>Description</entry>
-	   </row>
-	 </thead>
-	 <tbody>
-	   <row>
-	     <entry>org.freedesktop.DBus.Deprecated</entry>
-	     <entry>true,false</entry>
-	     <entry>Whether or not the entity is deprecated; defaults to false</entry>
-	   </row>
-	   <row>
-	     <entry>org.freedesktop.DBus.GLib.CSymbol</entry>
-	     <entry>(string)</entry>
-	     <entry>The C symbol; may be used for methods and interfaces</entry>
-	   </row>
-	   <row>
-	     <entry>org.freedesktop.DBus.Method.NoReply</entry>
-	     <entry>true,false</entry>
-	     <entry>If set, don't expect a reply to the method call; defaults to false.</entry>
-	   </row>
-	   <row>
-	     <entry>org.freedesktop.DBus.Property.EmitsChangedSignal</entry>
-	     <entry>true,invalidates,false</entry>
-	     <entry>
+         <thead>
+           <row>
+             <entry>Name</entry>
+             <entry>Values (separated by ,)</entry>
+             <entry>Description</entry>
+           </row>
+         </thead>
+         <tbody>
+           <row>
+             <entry>org.freedesktop.DBus.Deprecated</entry>
+             <entry>true,false</entry>
+             <entry>Whether or not the entity is deprecated; defaults to false</entry>
+           </row>
+           <row>
+             <entry>org.freedesktop.DBus.GLib.CSymbol</entry>
+             <entry>(string)</entry>
+             <entry>The C symbol; may be used for methods and interfaces</entry>
+           </row>
+           <row>
+             <entry>org.freedesktop.DBus.Method.NoReply</entry>
+             <entry>true,false</entry>
+             <entry>If set, don't expect a reply to the method call; defaults to false.</entry>
+           </row>
+           <row>
+             <entry>org.freedesktop.DBus.Property.EmitsChangedSignal</entry>
+             <entry>true,invalidates,false</entry>
+             <entry>
                <para>
                  If set to <literal>false</literal>, the
                  <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
@@ -3800,8 +3921,8 @@
                  interface element.
                </para>
              </entry>
-	   </row>
-	 </tbody>
+           </row>
+         </tbody>
        </tgroup>
      </informaltable>
   </sect1>
@@ -3914,11 +4035,11 @@
                   <entry>STRING</entry>
                   <entry>Name to request</entry>
                 </row>
-	        <row>
-		  <entry>1</entry>
-		  <entry>UINT32</entry>
-		  <entry>Flags</entry>
-	        </row>
+                <row>
+                  <entry>1</entry>
+                  <entry>UINT32</entry>
+                  <entry>Flags</entry>
+                </row>
               </tbody>
             </tgroup>
           </informaltable>
@@ -4029,10 +4150,10 @@
                 </row>
               </thead>
               <tbody>
-	        <row>
-		  <entry>DBUS_NAME_FLAG_ALLOW_REPLACEMENT</entry>
-		  <entry>0x1</entry>
-		  <entry>
+                <row>
+                  <entry>DBUS_NAME_FLAG_ALLOW_REPLACEMENT</entry>
+                  <entry>0x1</entry>
+                  <entry>
 
                     If an application A specifies this flag and succeeds in
                     becoming the owner of the name, and another application B
@@ -4046,11 +4167,11 @@
                     application A as the owner.
 
                   </entry>
-	        </row>
-	        <row>
-		  <entry>DBUS_NAME_FLAG_REPLACE_EXISTING</entry>
-		  <entry>0x2</entry>
-		  <entry>
+                </row>
+                <row>
+                  <entry>DBUS_NAME_FLAG_REPLACE_EXISTING</entry>
+                  <entry>0x2</entry>
+                  <entry>
 
                     Try to replace the current owner if there is one. If this
                     flag is not set the application will only become the owner of
@@ -4059,11 +4180,11 @@
                     the current owner specified DBUS_NAME_FLAG_ALLOW_REPLACEMENT.
 
                   </entry>
-	        </row>
-	        <row>
-		  <entry>DBUS_NAME_FLAG_DO_NOT_QUEUE</entry>
-		  <entry>0x4</entry>
-		  <entry>
+                </row>
+                <row>
+                  <entry>DBUS_NAME_FLAG_DO_NOT_QUEUE</entry>
+                  <entry>0x4</entry>
+                  <entry>
 
                     Without this flag, if an application requests a name that is
                     already owned, the application will be placed in a queue to
@@ -4076,10 +4197,10 @@
                     became the name owner.
 
                   </entry>
-	        </row>
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable>
 
           The return code can be one of the following values:
 
@@ -4093,41 +4214,41 @@
                 </row>
               </thead>
               <tbody>
-	        <row>
+                <row>
                   <entry>DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER</entry>
-		  <entry>1</entry> <entry>The caller is now the primary owner of
-		  the name, replacing any previous owner. Either the name had no
-		  owner before, or the caller specified
-		  DBUS_NAME_FLAG_REPLACE_EXISTING and the current owner specified
+                  <entry>1</entry> <entry>The caller is now the primary owner of
+                  the name, replacing any previous owner. Either the name had no
+                  owner before, or the caller specified
+                  DBUS_NAME_FLAG_REPLACE_EXISTING and the current owner specified
                   DBUS_NAME_FLAG_ALLOW_REPLACEMENT.</entry>
-	        </row>
-	        <row>
-		  <entry>DBUS_REQUEST_NAME_REPLY_IN_QUEUE</entry>
-		  <entry>2</entry>
+                </row>
+                <row>
+                  <entry>DBUS_REQUEST_NAME_REPLY_IN_QUEUE</entry>
+                  <entry>2</entry>
 
-		  <entry>The name already had an owner,
+                  <entry>The name already had an owner,
                     DBUS_NAME_FLAG_DO_NOT_QUEUE was not specified, and either
                     the current owner did not specify
                     DBUS_NAME_FLAG_ALLOW_REPLACEMENT or the requesting
                     application did not specify DBUS_NAME_FLAG_REPLACE_EXISTING.
                     </entry>
-	        </row>
-	        <row>
-		  <entry>DBUS_REQUEST_NAME_REPLY_EXISTS</entry> <entry>3</entry>
-		  <entry>The name already has an owner,
-		  DBUS_NAME_FLAG_DO_NOT_QUEUE was specified, and either
-		  DBUS_NAME_FLAG_ALLOW_REPLACEMENT was not specified by the
-		  current owner, or DBUS_NAME_FLAG_REPLACE_EXISTING was not
-		  specified by the requesting application.</entry>
-	        </row>
-	        <row>
-		  <entry>DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER</entry>
-		  <entry>4</entry>
-		  <entry>The application trying to request ownership of a name is already the owner of it.</entry>
-	        </row>
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
+                </row>
+                <row>
+                  <entry>DBUS_REQUEST_NAME_REPLY_EXISTS</entry> <entry>3</entry>
+                  <entry>The name already has an owner,
+                  DBUS_NAME_FLAG_DO_NOT_QUEUE was specified, and either
+                  DBUS_NAME_FLAG_ALLOW_REPLACEMENT was not specified by the
+                  current owner, or DBUS_NAME_FLAG_REPLACE_EXISTING was not
+                  specified by the requesting application.</entry>
+                </row>
+                <row>
+                  <entry>DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER</entry>
+                  <entry>4</entry>
+                  <entry>The application trying to request ownership of a name is already the owner of it.</entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable>
         </para>
        </sect3>
 
@@ -4200,7 +4321,7 @@
                 </row>
               </thead>
               <tbody>
-	        <row>
+                <row>
                   <entry>DBUS_RELEASE_NAME_REPLY_RELEASED</entry>
                   <entry>1</entry> <entry>The caller has released his claim on
                   the given name. Either the caller was the primary owner of
@@ -4208,21 +4329,21 @@
                   waiting in the queue for the name, or the caller was waiting
                   in the queue for the name and has now been removed from the
                   queue.</entry>
-	        </row>
-	        <row>
-		  <entry>DBUS_RELEASE_NAME_REPLY_NON_EXISTENT</entry>
-		  <entry>2</entry>
-		  <entry>The given name does not exist on this bus.</entry>
-	        </row>
-	        <row>
-		  <entry>DBUS_RELEASE_NAME_REPLY_NOT_OWNER</entry>
-		  <entry>3</entry>
-		  <entry>The caller was not the primary owner of this name,
+                </row>
+                <row>
+                  <entry>DBUS_RELEASE_NAME_REPLY_NON_EXISTENT</entry>
+                  <entry>2</entry>
+                  <entry>The given name does not exist on this bus.</entry>
+                </row>
+                <row>
+                  <entry>DBUS_RELEASE_NAME_REPLY_NOT_OWNER</entry>
+                  <entry>3</entry>
+                  <entry>The caller was not the primary owner of this name,
                   and was also not waiting in the queue to own this name.</entry>
-	        </row>
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
+                </row>
+              </tbody>
+            </tgroup>
+          </informaltable>
         </para>
        </sect3>
 
@@ -4384,7 +4505,7 @@
       <sect3 id="message-bus-routing-match-rules">
         <title>Match Rules</title>
         <para>
-	  An important part of the message bus routing protocol is match
+          An important part of the message bus routing protocol is match
           rules. Match rules describe the messages that should be sent to a
           client, based on the contents of the message.  Broadcast signals
           are only sent to clients which have a suitable match rule: this
@@ -4671,14 +4792,14 @@
         and <literal>Exec</literal> (the command to be executed).
 
         <figure>
-	  <title>Example service description file</title>
-	  <programlisting>
+          <title>Example service description file</title>
+          <programlisting>
             # Sample service description file
             [D-BUS Service]
             Name=com.example.ConfigurationDatabase
             Exec=/usr/bin/sample-configd
           </programlisting>
-	</figure>
+        </figure>
       </para>
 
       <para>
@@ -5260,16 +5381,16 @@
                   <entry>STRING</entry>
                   <entry>Name with a new owner</entry>
                 </row>
-	        <row>
-		  <entry>1</entry>
-		  <entry>STRING</entry>
-		  <entry>Old owner or empty string if none</entry>
-	        </row>
-	        <row>
-		  <entry>2</entry>
-		  <entry>STRING</entry>
-		  <entry>New owner or empty string if none</entry>
-	        </row>
+                <row>
+                  <entry>1</entry>
+                  <entry>STRING</entry>
+                  <entry>Old owner or empty string if none</entry>
+                </row>
+                <row>
+                  <entry>2</entry>
+                  <entry>STRING</entry>
+                  <entry>New owner or empty string if none</entry>
+                </row>
               </tbody>
             </tgroup>
           </informaltable>
@@ -5369,11 +5490,11 @@
                   <entry>STRING</entry>
                   <entry>Name of the service to start</entry>
                 </row>
-	        <row>
-		  <entry>1</entry>
-		  <entry>UINT32</entry>
-		  <entry>Flags (currently not used)</entry>
-	        </row>
+                <row>
+                  <entry>1</entry>
+                  <entry>UINT32</entry>
+                  <entry>Flags (currently not used)</entry>
+                </row>
               </tbody>
             </tgroup>
           </informaltable>
@@ -5411,7 +5532,7 @@
                 </row>
               </thead>
               <tbody>
-	        <row>
+                <row>
                   <entry>DBUS_START_REPLY_SUCCESS</entry>
                   <entry>1</entry>
                   <entry>The service was successfully started.</entry>
@@ -5868,8 +5989,8 @@
             </tgroup>
           </informaltable>
         Adds a match rule to match messages going through the message bus (see <xref linkend='message-bus-routing-match-rules'/>). 
-	If the bus does not have enough resources the <literal>org.freedesktop.DBus.Error.OOM</literal>
-	error is returned.
+        If the bus does not have enough resources the <literal>org.freedesktop.DBus.Error.OOM</literal>
+        error is returned.
        </para>
       </sect3>
       <sect3 id="bus-messages-remove-match">
@@ -5899,8 +6020,8 @@
             </tgroup>
           </informaltable>
         Removes the first rule that matches (see <xref linkend='message-bus-routing-match-rules'/>). 
-	If the rule is not found the <literal>org.freedesktop.DBus.Error.MatchRuleNotFound</literal>
-	error is returned.
+        If the rule is not found the <literal>org.freedesktop.DBus.Error.MatchRuleNotFound</literal>
+        error is returned.
        </para>
       </sect3>
 
@@ -6044,7 +6165,7 @@
 
     <glossentry id="one-to-one"><glossterm>One-to-One</glossterm>
       <glossdef>
-	<para>
+        <para>
           An application talking directly to another application, without going
           through a message bus. One-to-one connections may be "peer to peer" or
           "client to server." The D-Bus protocol has no concept of client
@@ -6084,7 +6205,7 @@
           Services normally guarantee some particular features, for example they
           may guarantee that they will request a specific name such as
           "com.example.Screensaver", have a singleton object
-	  "/com/example/Application", and that object will implement the
+          "/com/example/Application", and that object will implement the
           interface "com.example.Screensaver.Control".
         </para>
       </glossdef>