X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=man%2Favahi-daemon.conf.5.xml.in;h=bfbd0e52b3364e9f84289f99443d426799152eba;hb=83b432c2369d7ef4142811bea0109b6588b6f313;hp=5f59f16d1f8fa3bdf06f57c12cf265c9a1885aa7;hpb=67e74a17b34856b0f9b856fce03b5fba77cc5f5e;p=catta

diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index 5f59f16..bfbd0e5 100644
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -96,12 +96,14 @@
 
       <option>
         <p><opt>enable-dbus=</opt> Takes either "yes", "no" or
-        "warn". If set to "yes" avahi-daemon connects to D-BUS,
+        "warn". If set to "yes" avahi-daemon connects to D-Bus,
         offering an object oriented client API. It is only available
-        if avahi has been compiled with <opt>--enable-dbus</opt> in
+        if Avahi has been compiled with <opt>--enable-dbus</opt> in
         which case it defaults to "yes". "warn" behaves like "yes",
         but the daemon starts up even when it fails to connect to a
-        D-BUS daemon.</p>
+        D-Bus daemon. In addition, if the connection to the D-Bus
+        daemon is terminated we try to reconnect. (Unless we are in a
+        chroot() environment where this definitely will fail.) </p>
       </option>
 
       <option>
@@ -279,13 +281,13 @@
       </option>
 
       <option>
-        <p><opt>rlimit-nproc=</opt> Value for RLIMIT_NPROC (number of process of user). Since only a single avahi-daemon process is usually running you can set this safely to 1.</p>
+        <p><opt>rlimit-nproc=</opt> Value for RLIMIT_NPROC (number of process of user). avahi-daemon forks of a helper process on systems where <manref name="chroot" section="2"/> is available. Therefore this value should not be set below 2.</p>
       </option>
 
     </section>
 
 	<section name="Authors">
-	  <p>The avahi developers &lt;@PACKAGE_BUGREPORT@&gt;; avahi is
+	  <p>The Avahi Developers &lt;@PACKAGE_BUGREPORT@&gt;; Avahi is
 	  available from <url href="@PACKAGE_URL@"/></p>
 	</section>