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

diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index 9d13ce5..7dff097 100644
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -42,9 +42,21 @@
       </option>
 
       <option>
-        <p><opt>domain-name=</opt> Set the domain name avahi-domain
+        <p><opt>domain-name=</opt> Set the default domain name avahi-daemon
         tries to register its host name and services on the LAN in. If
-        omited defaults to ".local".</p>
+        omitted defaults to ".local".</p>
+      </option>
+
+      <option>
+        <p><opt>browse-domains=</opt> Set a comma seperated list of
+        browsing domains (in addition to the default one and those
+        announced inside the default browsing domain). Please note
+        that the user may specify additional browsing domains on the
+        client side, either by setting $AVAHI_BROWSE_DOMAINS to a list
+        of colon seperated domains or by adding them to the XDG config
+        file <file>~/.config/avahi/browse-domains</file> (seperated by
+        newlines).</p>
+        
       </option>
 
       <option>
@@ -86,15 +98,76 @@
         <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
+        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
+        traffic. Please note that we do no recommend running multiple
+        mDNS stacks on the same host simultaneously. This hampers
+        reliability and is a waste of resources. However, to not annoy
+        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> 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
+        different multicast DNS domains even with this option enabled
+        we encourage you to use subdomains of .local, such as
+        "kitchen.local". This option defaults to "yes".</p>
+      </option>
+      
+    </section>
+
 	<section name="Section [publish]">
+
+      <option><p><opt>disable-publishing=</opt> Takes a boolean value
+      ("yes" or "no"). If set to "yes", no record will be published by
+      Avahi, not even address records for the local host. Avahi will
+      be started in a querying-only mode. Use this is a security
+      measure. This option defaults to "no"</p></option>
+
+      <option><p><opt>disable-user-service-publishing=</opt> Takes a boolean value
+      ("yes" or "no"). If set to "yes", Avahi will still publish
+      address records and suchlike but will not allow user
+      applications to publish services. Use this is a security
+      measure. This option defaults to "no"</p></option>
+
+      <option>
+        <p><opt>add-service-cookie=</opt> Takes a boolean value ("yes"
+        or "no"). If set to "yes" an implicit TXT entry will be added
+        to all locally registered services, containing a cookie value
+        which is chosen randomly on daemon startup. This can be used
+        to detect if two services on two different
+        interfaces/protocols are actually identical. Defaults to
+        "yes".</p>
+      </option>
+
       <option>
         <p><opt>publish-addresses=</opt> Takes a boolean value ("yes"
         or "no"). If set to "yes" avahi-daemon will register mDNS