* Fix mis-labeled option in avahi-daemon.conf man page

[catta] / man / avahi-daemon.8.xml.in

diff --git a/man/avahi-daemon.8.xml.in b/man/avahi-daemon.8.xml.in
index 3e461acd30877164d05c83304bcf924be48b3a1d..1c949bed7dcde566370c21e94bf64baacd0ef097 100644 (file)
--- a/man/avahi-daemon.8.xml.in
+++ b/man/avahi-daemon.8.xml.in
@@ -30,8 +30,6 @@
       <cmd>avahi-daemon <opt>--kill</opt></cmd>
       <cmd>avahi-daemon <opt>--reload</opt></cmd>
       <cmd>avahi-daemon <opt>--check</opt></cmd>
-      <cmd>avahi-daemon <opt>--version</opt></cmd>
-      <cmd>avahi-daemon <opt>--help</opt></cmd>
        </synopsis>
        
     <description>
@@ -47,10 +45,13 @@
       there is the DBUS interface which provides a rich object
       oriented interface to DBUS enabled applications.</p>
       
-      <p>Upon startup avahi-daemon interpretes its configuration file
-      @pkgsysconfdir@/avahi-daemon.conf and reads XML fragments from
-      @servicedir@/*.service which may define static DNS-SD
-      services.</p>
+      <p>Upon startup avahi-daemon interprets its configuration file
+      <file>@pkgsysconfdir@/avahi-daemon.conf</file> and reads XML
+      fragments from <file>@servicedir@/*.service</file> which may
+      define static DNS-SD services. If you enable
+      <opt>publish-resolv-conf-dns-servers</opt> in
+      <file>avahi-daemon.conf</file> the file
+      <file>/etc/resolv.conf</file> will be read, too.</p>
        </description>
        
        <options>
@@ -62,9 +63,42 @@
 
          <option>
                <p><opt>-D | --daemonize</opt></p>
-               <optdesc><p>Daemonize avahi-daemon after startup and redirect log messages to syslog.</p></optdesc>
+               <optdesc><p>Daemonize after startup. Implies <opt>--syslog</opt></p></optdesc>
          </option>
 
+      <option>
+        <p><opt>-s | --syslog</opt></p>
+        <optdesc><p>Log to syslog instead of STDERR. Implied by <opt>--daemonize</opt></p></optdesc>
+      </option>
+
+      <option>
+        <p><opt>--debug</opt></p>
+        <optdesc><p>Increase verbosity to debug level</p></optdesc>
+      </option>
+
+      <option>
+        <p><opt>--no-rlimits</opt></p>
+        <optdesc><p>Don't enforce resource limits as specified in the configuration file. (See <manref section="2" name="setrlimit"/> for more information)</p></optdesc>
+      </option>
+
+      <option>
+        <p><opt>--no-drop-root</opt></p>
+        <optdesc><p>Don't drop root priviliges after startup and don't require daemon to be started as root. We recommend not to use this option.</p></optdesc>
+      </option>
+
+      <option>
+        <p><opt>--no-chroot</opt></p>
+        <optdesc><p>Don't <manref section="2" name="chroot"/> the daemon. This option is only available when compiled with chroot() support.</p></optdesc>
+      </option>
+
+      <option>
+        <p><opt>--no-proctitle</opt></p>
+        <optdesc><p>Don't change the process name while
+        running. Unless this option is specified avahi will reflect
+        it's current state and selected host name in the process
+        title.</p></optdesc>
+      </option>
+
          <option>
                <p><opt>-k | --kill</opt></p>
                <optdesc><p>Kill an already running avahi-daemon. (equivalent to sending a SIGTERM)</p></optdesc>
@@ -72,7 +106,14 @@
 
          <option>
                <p><opt>-r | --reload</opt></p>
-               <optdesc><p>Tell an already running avahi-daemon to reread the files from @servicedir@/. (equivalent to sending a SIGHUP)</p></optdesc>
+               <optdesc><p>Tell an already running avahi-daemon to reread
+               <file>/etc/resolv.conf</file> (in case you enabled
+        <opt>publish-resolv-conf-dns-servers</opt> in
+               <file>avahi-daemon.conf</file>) the files from
+               <file>@servicedir@/</file>. Please note that this will not
+               reload the
+               <file>@pkgsysconfdir@/avahi-daemon.conf</file>. (equivalent to
+               sending a SIGHUP)</p></optdesc>
          </option>
 
          <option>
@@ -92,7 +133,6 @@
 
        </options>
 
-
     <section name="Files">
       
       <p><file>@pkgsysconfdir@/avahi-daemon.conf</file>: the default configuration file for avahi-daemon.</p>
@@ -103,7 +143,9 @@
 
     <section name="Signals">
       <p><arg>SIGINT, SIGTERM, SIGQUIT</arg>: avahi-daemon will shutdown. This is issued by passing --kill to avahi-daemon.</p>
-      <p><arg>SIGHUP</arg>: avahi-daemon will reload the static service definitions from @servicedir@/.</p>
+      <p><arg>SIGHUP</arg>: avahi-daemon will reload unicast DNS
+      server data from <file>/etc/resolv.conf</file> and static
+      service definitions from <file>@servicedir@/</file>.</p>
       <p><arg>SIGUSR1</arg>: avahi-daemon will dump local and remote cached resource record data to syslog.</p>
     </section>
 
@@ -114,7 +156,7 @@
        
        <section name="See also">
          <p>
-        <manref name="avahi-dnsconfd" section="8"/>, <manref name="avahi-daemon.conf" section="5"/>
+        <manref name="avahi-daemon.conf" section="5"/>, <manref name="avahi.service" section="5"/>, <manref name="avahi-dnsconfd" section="8"/>
          </p>
        </section>