compile python module even without gtk. It seems, that most parts of python are not...

[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..e00a911aa478e244106ae8935f83009e75b0c12a 100644 (file)
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -96,12 +96,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 +112,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>


@@ -165,7 +165,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 +223,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,13 +297,13 @@
       </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>