X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=man%2Favahi-daemon.conf.5.xml.in;h=baa9a21a33500284aa0c65df4d82d2f684368797;hb=7862fd0cb20eed204be336d050dd9c4e72528d62;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..baa9a21 100644
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -4,19 +4,19 @@
 
 <!-- $Id$ -->
 
-<!-- 
+<!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -28,11 +28,11 @@
 	<synopsis>
       <cmd>@pkgsysconfdir@/avahi-daemon.conf</cmd>
 	</synopsis>
-	
+
     <description>
       <p><file>avahi-daemon.conf</file> is the configuration file for avahi-daemon.</p>
 	</description>
-	
+
 	<section name="Section [Server]">
 
       <option>
@@ -48,15 +48,15 @@
       </option>
 
       <option>
-        <p><opt>browse-domains=</opt> Set a comma seperated list of
+        <p><opt>browse-domains=</opt> Set a comma separated 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
+        of colon separated domains or by adding them to the XDG config
+        file <file>~/.config/avahi/browse-domains</file> (separated by
         newlines).</p>
-        
+
       </option>
 
       <option>
@@ -71,6 +71,22 @@
         sockets. Default is "yes".</p>
       </option>
 
+      <option>
+        <p><opt>allow-interfaces=</opt> Set a comma separated list of
+        allowed network interfaces that should be used by the
+        avahi-daemon.  Other interfaces will be ignored. If set to the
+        empty list all local interfaces except loopback and
+        point-to-point will be used.</p>
+      </option>
+
+      <option>
+        <p><opt>deny-interfaces=</opt> Set a comma separated list of
+        network interfaces that should be ignored by avahi-daemon.
+	Other not specified interfaces will be used, unless
+	<opt>allow-interfaces</opt> is set. This option takes
+	precedence over <opt>deny-interfaces</opt>.</p>
+      </option>
+
       <option>
         <p><opt>check-response-ttl=</opt> Takes a boolean value ("yes"
         or "no"). If set to "yes", an additional security check is
@@ -96,31 +112,44 @@
 
       <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
+        ("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
+        traffic. Please note that we do not 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> 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
@@ -128,7 +157,7 @@
         we encourage you to use subdomains of .local, such as
         "kitchen.local". This option defaults to "yes".</p>
       </option>
-      
+
     </section>
 
 	<section name="Section [publish]">
@@ -152,7 +181,7 @@
         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>
+        "no".</p>
       </option>
 
       <option>
@@ -193,7 +222,7 @@
       </option>
 
       <option>
-        <p><opt>publish-dns-servers=</opt> Takes a comma seperated
+        <p><opt>publish-dns-servers=</opt> Takes a comma separated
         list of IP addresses for unicast DNS servers. You can use this
         to announce unicast DNS servers via mDNS. When used in
         conjunction with avahi-dnsconfd on the client
@@ -210,6 +239,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]">
@@ -268,25 +313,25 @@
       </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>
-	
+
 	<section name="See also">
 	  <p>
         <manref name="avahi-daemon" section="8"/>, <manref name="avahi-dnsconfd" section="8"/>
 	  </p>
 	</section>
-	
+
 	<section name="Comments">
 	  <p>This man page was written using <manref name="xml2man" section="1"
 		  href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
 	</section>
-	
+
   </manpage>