small doc fix

[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 45fdf9f09b5ac5fc9e964d25c72c301f8b6eba5e..89aa38e51971cf47b3b2e698af27641e95cd144f 100644 (file)
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -83,13 +83,26 @@
       </option>
 
       <option>
-        <p><opt>enable-dbus=</opt> Takes a boolean value ("yes" or
-        "no"). If set to "yes" avahi-daemon connects to DBUS, to offer
-        an object oriented client API. Only available if avahi has
-        been compiled with <opt>--enable-dbus</opt> in which case it
-        defaults to "yes".</p>
+        <p><opt>enable-dbus=</opt> Takes either "yes", "no" or
+        "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
+        D-BUS daemon.</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
+        to all locally registered services, containing a cookie value
+        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>
+      </option>
+
+
        </section>
 
        <section name="Section [publish]">
@@ -173,6 +186,44 @@
       </option>
     </section>
 
+    <section name="Section [rlimits]">
+      <p>This section is used to define system resource limits for the
+      daemon. See <manref section="2" name="setrlimit"/> for more
+      information. If any of the options is not specified in the configuration
+      file, avahi-daemon does not change it from the system
+      defaults.</p>
+
+
+      <option>
+        <p><opt>rlimit-as=</opt> Value in bytes for RLIMIT_AS (maximum size of the process's virtual memory). Sensible values are heavily system dependent.</p>
+      </option>
+
+      <option>
+        <p><opt>rlimit-core=</opt> Value in bytes for RLIMIT_CORE (maximum core file size). Unless you want to debug avahi-daemon, it is safe to set this to 0.</p>
+      </option>
+
+      <option>
+        <p><opt>rlimit-data=</opt> Value in bytes for RLIMIT_DATA (maximum size of the process's data segment). Sensible values are heavily system dependent.</p>
+      </option>
+
+      <option>
+        <p><opt>rlimit-fsize=</opt> Value for RLIMIT_FSIZE (maximum size of files the process may create). Since avahi-daemon shouldn't write any files to disk, it is safe to set this to 0.</p>
+      </option>
+
+      <option>
+        <p><opt>rlimit-nofile=</opt> Value for RLIMIT_NOFILE (open file descriptors). avahi-daemon shouldn't need more than 15 to 20 open file descriptors concurrently.</p>
+      </option>
+
+      <option>
+        <p><opt>rlimit-stack=</opt> Value in bytes for RLIMIT_STACK (maximum size of the process stack). Sensible values are heavily system dependent.</p>
+      </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>
+      </option>
+
+    </section>
+
        <section name="Authors">
          <p>The avahi developers &lt;@PACKAGE_BUGREPORT@&gt;; avahi is
          available from <url href="@PACKAGE_URL@"/></p>