X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=man%2Favahi-daemon.8.xml.in;h=b45e8c189e3491a100ac3a57bc167ce0a594c4a2;hb=c7ecad8fa467b8be2b34064020e2c541c480645e;hp=a7013405bfb74988d8a3c4e6b819b31587fbe9a0;hpb=a9e118b82c39b12695575229934af435058668a5;p=catta

diff --git a/man/avahi-daemon.8.xml.in b/man/avahi-daemon.8.xml.in
index a701340..b45e8c1 100644
--- a/man/avahi-daemon.8.xml.in
+++ b/man/avahi-daemon.8.xml.in
@@ -30,12 +30,10 @@
       <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>
-      <p>The Avahi mDNS/DNS-SD daemon implementing Apple's ZeroConf
+      <p>The Avahi mDNS/DNS-SD daemon implements Apple's Zeroconf
       architecture (also known as "Rendezvous" or "Bonjour"). The daemon
       registers local IP addresses and static services using
       mDNS/DNS-SD and provides two IPC APIs for local programs to make
@@ -44,13 +42,16 @@
       exclusively by avahi-dnsconfd (a daemon which configures unicast
       DNS servers using server info published via mDNS) and nss-mdns
       (a libc NSS plugin, providing name resolution via mDNS). Finally
-      there is the DBUS interface which provides a rich object
-      oriented interface to DBUS enabled applications.</p>
+      there is the D-Bus interface which provides a rich object
+      oriented interface to D-Bus enabled applications.</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.</p>
+      <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 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-proc-title</opt></p>
+        <optdesc><p>Don't change the process name while
+        running. Unless this option is specified avahi-daemon will reflect
+        its current state and the 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 <file>@servicedir@/</file>. Please note that this will not reload the <file>@pkgsysconfdir@/avahi-daemon.conf</file>(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,30 +133,35 @@
 
 	</options>
 
-
     <section name="Files">
       
-      <p><file>@pkgsysconfdir@/avahi-daemon.conf</file>: the default configuration file for avahi-daemon.</p>
+      <p><file>@pkgsysconfdir@/avahi-daemon.conf</file>: the default configuration file for avahi-daemon, <manref name="avahi-daemon.conf" section="5"/> for more information.</p>
 
-      <p><file>@servicedir@/*.service</file>: static service definitions.</p>
+      <p><file>@pkgsysconfdir@/hosts</file>: additional static hostname mappings to publish in mDNS, see <manref name="avahi.hosts" section="5"/> for more information.</p>
+
+      <p><file>@servicedir@/*.service</file>: static service definitions, see <manref name="avahi.service" section="5"/> for more information.</p>
     
     </section>
 
     <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 <file>@servicedir@/</file>.</p>
+      <p><arg>SIGINT, SIGTERM, SIGQUIT</arg>: avahi-daemon will shutdown. (Same as <opt>--kill</opt>).</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>. (Same as <opt>--reload</opt>)</p>
       <p><arg>SIGUSR1</arg>: avahi-daemon will dump local and remote cached resource record data to syslog.</p>
     </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>
 	
 	<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.hosts" section="5"/>, <manref name="avahi.service" section="5"/>, <manref name="avahi-dnsconfd" section="8"/>, <manref name="avahi-set-host-name" section="1"/>
 	  </p>
+
+      <p>http://avahi.org/wiki/AvahiAndUnicastDotLocal documents the problems when using Avahi in a unicast DNS zone .local.</p>
 	</section>
 	
 	<section name="Comments">