summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChengwei Yang <chengwei.yang@intel.com>2013-12-10 10:06:23 +0800
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-01-06 16:08:52 +0000
commita77f64d5e1b411b14a6768d63a2c677ae064a256 (patch)
treebabc6c1f670b5d5e1e37bf8a9229a3b57bfb7cc4
parent7628af5924dc4359e8f1334070310aabf3901ada (diff)
downloaddbus-a77f64d5e1b411b14a6768d63a2c677ae064a256.tar.gz
dbus-daemon(1): align document about "bind" with DBus Spec
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72301 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r--doc/dbus-daemon.1.xml.in13
1 files changed, 7 insertions, 6 deletions
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>