X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=man%2Favahi-daemon.conf.5.xml.in;h=efd1a41a038e3a1c69172e0e6b8ce12e2fa6a927;hb=a4ebf2e6c969b1ff4af0cab6be19856bf241c0c5;hp=89aa38e51971cf47b3b2e698af27641e95cd144f;hpb=29738ceee56fdbf68e9dd3d6a83256c3f7d75886;p=catta

diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index 89aa38e..efd1a41 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>
@@ -84,14 +96,68 @@
 
       <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>
+        <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
@@ -102,10 +168,6 @@
         "yes".</p>
       </option>
 
-
-	</section>
-
-	<section name="Section [publish]">
       <option>
         <p><opt>publish-addresses=</opt> Takes a boolean value ("yes"
         or "no"). If set to "yes" avahi-daemon will register mDNS
@@ -161,6 +223,22 @@
         SIGHUP to have it reload this file. Defaults to "no".</p>
       </option>
 
+      <option>
+        <p><opt>publish-aaaa-on-ipv4=</opt> Takes a boolean value
+        ("yes" or "no"). If set to "yes" avahi-daemon will publish an
+        IPv6 AAAA record via IPv4, i.e. the local IPv6 addresses can be
+        resolved using an IPv4 transport. Only useful when IPv4 is
+        enabled with <opt>use-ipv4=true</opt>. Defaults to "yes".</p>
+      </option>
+
+      <option>
+        <p><opt>publish-a-on-ipv6=</opt> Takes a boolean value
+        ("yes" or "no"). If set to "yes" avahi-daemon will publish an
+        IPv4 A record via IPv6, i.e. the local IPv4 addresses can be
+        resolved using an IPv6 transport. Only useful when IPv6 is
+        enabled with <opt>use-ipv6=true</opt>. Defaults to "no".</p>
+      </option>
+
     </section>
 
 	<section name="Section [reflector]">
@@ -219,13 +297,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>