Merge branch 'master' of ssh://rootserver/home/lennart/git/public/avahi

[catta] / man / avahi-daemon.conf.5.xml.in

diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index 7dff0974c1d957f919fd2045190a7b4ddc25fa75..08992fa6f69db4ff4545d5d148383307e8a583a3 100644 (file)
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -4,19 +4,19 @@
 
 <!-- $Id$ -->
 
 
 <!-- $Id$ -->
 

-<!-- 
+<!--

   This file is part of avahi.
   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 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.
   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
   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>
        <synopsis>
       <cmd>@pkgsysconfdir@/avahi-daemon.conf</cmd>
        </synopsis>

-       
+

     <description>
       <p><file>avahi-daemon.conf</file> is the configuration file for avahi-daemon.</p>
        </description>
     <description>
       <p><file>avahi-daemon.conf</file> is the configuration file for avahi-daemon.</p>
        </description>

-       
+

        <section name="Section [Server]">
 
       <option>
        <section name="Section [Server]">
 
       <option>


@@ -56,7 +56,7 @@
         of colon seperated domains or by adding them to the XDG config
         file <file>~/.config/avahi/browse-domains</file> (seperated by
         newlines).</p>
         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>
       </option>
 
       <option>


@@ -71,6 +71,22 @@
         sockets. Default is "yes".</p>
       </option>
 
         sockets. Default is "yes".</p>
       </option>
 

+      <option>
+        <p><opt>allow-interfaces=</opt> Set a comma seperated 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 seperated 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
       <option>
         <p><opt>check-response-ttl=</opt> Takes a boolean value ("yes"
         or "no"). If set to "yes", an additional security check is


@@ -96,12 +112,12 @@
 
       <option>
         <p><opt>enable-dbus=</opt> Takes either "yes", "no" or
 
       <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
         which case it defaults to "yes". "warn" behaves like "yes",
         but the daemon starts up even when it fails to connect to a
         offering an object oriented client API. It is only available
         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. In addition, if the connection to the D-BUS
+        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>
         daemon is terminated we try to reconnect. (Unless we are in a
         chroot() environment where this definitely will fail.) </p>
       </option>


@@ -112,7 +128,7 @@
         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
         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>
         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>


@@ -141,7 +157,7 @@
         we encourage you to use subdomains of .local, such as
         "kitchen.local". This option defaults to "yes".</p>
       </option>
         we encourage you to use subdomains of .local, such as
         "kitchen.local". This option defaults to "yes".</p>
       </option>

-      
+

     </section>
 
        <section name="Section [publish]">
     </section>
 
        <section name="Section [publish]">


@@ -165,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
         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>
       </option>
 
       <option>


@@ -223,6 +239,22 @@
         SIGHUP to have it reload this file. Defaults to "no".</p>
       </option>
 
         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]">
     </section>
 
        <section name="Section [reflector]">


@@ -281,25 +313,25 @@
       </option>
 
       <option>
       </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">
       </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>
          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="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>
        <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>
   </manpage>