fix avahi_netlink_new to allow multiple netlinks per process

[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 3c8153ed751be4f76d8e08561e36ec896ad0a587..2d15017a16b0b5233c7138ae60be2a6e8abebd85 100644 (file)
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -39,6 +39,12 @@
       name as set with the sethostname() system call.</p>
     </option>
 
       name as set with the sethostname() system call.</p>
     </option>
 

+    <option>
+      <p><opt>host-name-from-machine-id=</opt> Takes a boolean
+      value ("yes" or "no"). If set to "yes" avahi-daemon
+      will use the machine-id as name on the LAN.</p>
+    </option>
+

     <option>
       <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
     <option>
       <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


@@ -72,8 +78,8 @@
     <option>
       <p><opt>allow-interfaces=</opt> Set a comma separated list of
       allowed network interfaces that should be used by the
     <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
+      avahi-daemon. Traffic on other interfaces will be ignored. If
+      set to an empty list all local interfaces except loopback and

       point-to-point will be used.</p>
     </option>
 
       point-to-point will be used.</p>
     </option>
 


@@ -81,8 +87,8 @@
       <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
       <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>
+      <opt>allow-interfaces=</opt> is set. This option takes
+      precedence over <opt>allow-interfaces=</opt>.</p>

     </option>
 
     <option>
     </option>
 
     <option>


@@ -159,7 +165,7 @@
     <option>
       <p><opt>objects-per-client-max=</opt> Takes an unsigned
       integer. The maximum number of objects (entry groups, browsers,
     <option>
       <p><opt>objects-per-client-max=</opt> Takes an unsigned
       integer. The maximum number of objects (entry groups, browsers,

-      resolvers) that may be registered per client at a time. If the
+      resolvers) that may be registered per D-Bus client at a time. If the

       maximum number is reached further object creation will be
       refused until at least one object is freed.</p>
     </option>
       maximum number is reached further object creation will be
       refused until at least one object is freed.</p>
     </option>


@@ -167,10 +173,26 @@
     <option>
       <p><opt>entries-per-entry-group-max=</opt> Takes an unsigned
       integer. The maximum number of entries (resource records) per
     <option>
       <p><opt>entries-per-entry-group-max=</opt> Takes an unsigned
       integer. The maximum number of entries (resource records) per

-      entry group at a time. If the maximum number is reached further
-      resource records may not be added to an entry group.</p>
+      entry group registered by a D-Bus client at a time. If the
+      maximum number is reached further resource records may not be
+      added to an entry group.</p>

     </option>
 
     </option>
 

+    <option>
+      <p><opt>ratelimit-interval-usec=</opt> Takes an unsigned
+      integer. Sets the per-interface packet rate-limiting interval
+      parameter. Together with <opt>ratelimit-burst=</opt> this may be
+      used to control the maximum number of packets Avahi will
+      generated in a specific period of time on an interface.</p>
+    </option>
+
+    <option>
+      <p><opt>ratelimit-burst=</opt> Takes an unsigned
+      integer. Sets the per-interface packet rate-limiting burst
+      parameter. Together with <opt>ratelimit-interval-usec=</opt> this may be
+      used to control the maximum number of packets Avahi will
+      generated in a specific period of time on an interface.</p>
+    </option>

   </section>
 
   <section name="Section [wide-area]">
   </section>
 
   <section name="Section [wide-area]">


@@ -228,7 +250,7 @@
       useful for administrative purposes. This is recommended by the
       mDNS specification but not required. For the sake of privacy
       you might choose to disable this feature. Defaults to
       useful for administrative purposes. This is recommended by the
       mDNS specification but not required. For the sake of privacy
       you might choose to disable this feature. Defaults to

-      "yes."</p>
+      "no".</p>

     </option>
 
     <option>
     </option>
 
     <option>


@@ -238,7 +260,7 @@
       might be useful for administrative purposes (i.e. browse for
       all PCs on the LAN), but is not required or recommended by any
       specification. Newer MacOS X releases register a service of
       might be useful for administrative purposes (i.e. browse for
       all PCs on the LAN), but is not required or recommended by any
       specification. Newer MacOS X releases register a service of

-      this type. Defaults to "yes".</p>
+      this type. Defaults to "no".</p>

     </option>
 
     <option>
     </option>
 
     <option>