X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=man%2Favahi-autoipd.8.xml.in;h=7137c308a500d003feda3b46bf1b4b6f22d44b25;hb=0458aec3b31f7a5c73bab74f131914249c8dd6f6;hp=c40ce396b0ef2a49b7202fe198c3702667715614;hpb=40de1a34d5663c55215d56ceaecc1411a6dfd8f8;p=catta

diff --git a/man/avahi-autoipd.8.xml.in b/man/avahi-autoipd.8.xml.in
index c40ce39..7137c30 100644
--- a/man/avahi-autoipd.8.xml.in
+++ b/man/avahi-autoipd.8.xml.in
@@ -2,21 +2,19 @@
 <!DOCTYPE manpage SYSTEM "xmltoman.dtd">
 <?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
 
-<!-- $Id$ -->
-
-<!-- 
+<!--
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -31,7 +29,7 @@
       <cmd>avahi-autoipd <opt>--refresh</opt> <arg>interface</arg></cmd>
       <cmd>avahi-autoipd <opt>--check</opt> <arg>interface</arg></cmd>
 	</synopsis>
-	
+
     <description>
       <p>avahi-autoipd implements IPv4LL, "Dynamic Configuration of
       IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for
@@ -45,8 +43,18 @@
       <p>avahi-autoipd can be used as stand-alone address allocator
       or as plugin for a DHCP client such as ISC's dhclient, where it
       can be used as fallback solution if no DHCP server is found.</p>
+
+      <p>To allow communication between hosts that have only an IPv4LL
+      address assigned and hosts that only have a routable IP address
+      assigned you may add the following routes to both network
+      configurations:</p>
+
+      <p><opt>route add -net 169.254.0.0 netmask 255.255.0.0 dev eth0 metric 99</opt></p>
+      <p><opt>route add default dev eth0 metric 99</opt></p>
+
+      <p>See http://developer.apple.com/qa/qa2004/qa1357.html for more information.</p>
 	</description>
-	
+
 	<options>
 
 	  <option>
@@ -61,7 +69,7 @@
 
 	  <option>
 		<p><opt>-r | --refresh</opt></p>
-		<optdesc><p>Tell an already running avahi-autoipd to reannounce the acquired IP address on the specified network interface. (Equivalent to sending a SIGHUP)</p></optdesc>
+		<optdesc><p>Tell an already running avahi-autoipd to re-announce the acquired IP address on the specified network interface. (Equivalent to sending a SIGHUP)</p></optdesc>
 	  </option>
 
 	  <option>
@@ -81,7 +89,7 @@
 
       <option>
         <p><opt>--no-drop-root</opt></p>
-        <optdesc><p>Don't drop root priviliges after startup. We recommend not to use this option.</p></optdesc>
+        <optdesc><p>Don't drop root privileges after startup. We recommend not to use this option.</p></optdesc>
       </option>
 
       <option>
@@ -96,9 +104,9 @@
 
       <option>
         <p><opt>-w | --wait</opt></p>
-        <optdesc><p>Wait until a IP address has been sucessfully acquired before detaching. Only valid in combination with <opt>--daemonize</opt>.</p></optdesc>
+        <optdesc><p>Wait until a IP address has been successfully acquired before detaching. Only valid in combination with <opt>--daemonize</opt>.</p></optdesc>
       </option>
-      
+
       <option>
         <p><opt>--force-bind</opt></p>
         <optdesc><p>Acquire an IPv4LL address, even if a routable address has been configured on the interface.</p></optdesc>
@@ -108,7 +116,7 @@
         <p><opt>--no-proc-title</opt></p>
         <optdesc><p>Don't change the process name while
         running. Unless this option is specified avahi-autoipd will
-        reflect it's current state and the IP address in the process
+        reflect its current state and the IP address in the process
         title.</p></optdesc>
       </option>
 
@@ -125,30 +133,32 @@
 	</options>
 
     <section name="Files">
-      
+
       <p><file>@pkgsysconfdir@/avahi-autoipd.action</file>: the script to run when an IP address as been acquired or is lost.</p>
-    
+
     </section>
 
     <section name="Signals">
-      <p><arg>SIGINT, SIGTERM, SIGQUIT</arg>: avahi-autoipd will shutdown. (Same as <opt>--kill</opt>)</p>
-      <p><arg>SIGHUP</arg>: avahi-autoipd will reannounce the acquired IP address. (Same as <opt>--refresh</opt>)</p>
+      <p><arg>SIGINT, SIGTERM</arg>: avahi-autoipd will shutdown. (Same as <opt>--kill</opt>)</p>
+      <p><arg>SIGHUP</arg>: avahi-autoipd will re-announce the acquired IP address. (Same as <opt>--refresh</opt>)</p>
     </section>
 
 	<section name="Authors">
 	  <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="autoipd.action" section="8"/>, <manref name="dhclient" section="8"/>
 	  </p>
+
+      <p>http://avahi.org/wiki/AvahiAutoipd documents how avahi-autoipd is best packaged and integrated into distributions.</p>
 	</section>
-	
+
 	<section name="Comments">
 	  <p>This man page was written using <manref name="xml2man" section="1"
 		  href="http://masqmail.cx/xml2man/"/> by Oliver Kurth.</p>
 	</section>
-	
+
   </manpage>