X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=man%2Favahi-daemon.conf.5.xml.in;h=7dff0974c1d957f919fd2045190a7b4ddc25fa75;hb=a534996c7f304b219c3c3c41d97f6c20051871f2;hp=cce8229405159fbe3d24fefca458e5f4e8dd514c;hpb=d4d2f194bfd971eef1eff8631d499ca894c53f4a;p=catta

diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index cce8229..7dff097 100644
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -98,15 +98,17 @@
         <p><opt>enable-dbus=</opt> Takes either "yes", "no" or
         "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>
         <p><opt>disallow-other-stacks=</opt> Takes a boolean value
-        ("yes" or "no"). If set to "yes", no other process is allowed
+        ("yes" or "no"). If set to "yes" no other process is allowed
         to bind to UDP port 5353. This effectively impedes other mDNS
         stacks from running on the host. Use this as a security
         measure to make sure that only Avahi is responsible for mDNS
@@ -116,11 +118,22 @@
         people this option defaults to "no".</p>
       </option>
 
+      <option>
+        <p><opt>allow-point-to-point=</opt> Takes a boolean value
+        ("yes" or "no"). If set to "yes" avahi-daemon will make use of
+        interfaces with the POINTOPOINT flag set. This option defaults
+        to "no" as it might make mDNS unreliable due to usually large
+        latencies with such links and opens a potential security hole
+        by allowing mDNS access from Internet connections. Use with
+        care and YMMV!</p>
+      </option>
+
 	</section>
 
 	<section name="Section [wide-area]">
       <option>
-        <p><opt>enable-wide-area=</opt> Enable wide-area DNS-SD, aka
+        <p><opt>enable-wide-area=</opt> Takes a boolean value
+        ("yes" or "no"). Enable wide-area DNS-SD, aka
         DNS-SD over unicast DNS. If this is enabled only domains
         ending in .local will be resolved on mDNS, all other domains
         are resolved via unicast DNS. If you want to maintain multiple