Imported Upstream version 0.6.29upstream/0.6.29

9 files changed, 17 insertions, 14 deletions

diff --git a/man/Makefile.in b/man/Makefile.in
index e61222c..e86a846 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -165,6 +165,7 @@ DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -251,6 +252,7 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MCS = @MCS@
 MDASSEMBLER = @MDASSEMBLER@
 MKDIR_P = @MKDIR_P@
@@ -313,6 +315,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
diff --git a/man/avahi-autoipd.8 b/man/avahi-autoipd.8
index 32949b7..862d25f 100644
--- a/man/avahi-autoipd.8
+++ b/man/avahi-autoipd.8
@@ -33,7 +33,7 @@ Daemonize after startup. Implies \fB--syslog\f1.
 Kill an already running avahi-autoipd on the specified network interface. (Equivalent to sending a SIGTERM)
 .TP
 \fB-r | --refresh\f1
-Tell an already running avahi-autoipd to reannounce the acquired IP address on the specified network interface. (Equivalent to sending a SIGHUP)
+Tell an already running avahi-autoipd to re-announce the acquired IP address on the specified network interface. (Equivalent to sending a SIGHUP)
 .TP
 \fB-c | --check\f1
 Return 0 as return code if avahi-autoipd is already running for the specified network interface.
@@ -54,7 +54,7 @@ Don't \fBchroot(2)\f1 the daemon. This option is only available when compiled wi
 Try to acquire the specified IP address, which must be from the IPv4LL range 169.254.0.0/16.
 .TP
 \fB-w | --wait\f1
-Wait until a IP address has been sucessfully acquired before detaching. Only valid in combination with \fB--daemonize\f1.
+Wait until a IP address has been successfully acquired before detaching. Only valid in combination with \fB--daemonize\f1.
 .TP
 \fB--force-bind\f1
 Acquire an IPv4LL address, even if a routable address has been configured on the interface.
@@ -70,9 +70,9 @@ Show version information.
 .SH FILES
 \fI/etc/avahi/avahi-autoipd.action\f1: the script to run when an IP address as been acquired or is lost.
 .SH SIGNALS
-\fISIGINT, SIGTERM, SIGQUIT\f1: avahi-autoipd will shutdown. (Same as \fB--kill\f1)
+\fISIGINT, SIGTERM\f1: avahi-autoipd will shutdown. (Same as \fB--kill\f1)
 
-\fISIGHUP\f1: avahi-autoipd will reannounce the acquired IP address. (Same as \fB--refresh\f1)
+\fISIGHUP\f1: avahi-autoipd will re-announce the acquired IP address. (Same as \fB--refresh\f1)
 .SH AUTHORS
 The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
 .SH SEE ALSO
diff --git a/man/avahi-autoipd.8.xml.in b/man/avahi-autoipd.8.xml.in
index 477beb8..7137c30 100644
--- a/man/avahi-autoipd.8.xml.in
+++ b/man/avahi-autoipd.8.xml.in
@@ -69,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>
@@ -104,7 +104,7 @@
 
       <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>
@@ -139,8 +139,8 @@
     </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">
diff --git a/man/avahi-autoipd.action.8 b/man/avahi-autoipd.action.8
index 3cb6799..62b14a4 100644
--- a/man/avahi-autoipd.action.8
+++ b/man/avahi-autoipd.action.8
@@ -8,7 +8,7 @@ avahi-autoipd.action \- avahi-autoipd action script
 \fIavahi-autoipd.action\f1 is the action script that is called whenever an IP address has been acquired by avahi-autoipd or when it detected an IP address conflict. The script should add or remove the specified address from the specified network interface.
 .SH PARAMETERS
 .TP
-\fBargv[1]\f1 An event string: one of BIND, CONFLICT, UNBIND or STOP. If BIND is passed an IP address has been sucessfully acquired and the script shall add it to the network interface. If CONFLICT is passed avahi-autopid detected a IP address on the local network, the action script should remove the configured IP address. If UNBIND is passed the IP address should be removed from the interface, too, because a routable address has been configured to the interface by some other program. If STOP is passed the avahi-autoipd is being shutdown and the action script should remove the IP address. In short: on BIND the address should be added to the interface, on CONFLICT, UNBIND or STOP it should be removed. 
+\fBargv[1]\f1 An event string: one of BIND, CONFLICT, UNBIND or STOP. If BIND is passed an IP address has been successfully acquired and the script shall add it to the network interface. If CONFLICT is passed avahi-autopid detected a IP address on the local network, the action script should remove the configured IP address. If UNBIND is passed the IP address should be removed from the interface, too, because a routable address has been configured to the interface by some other program. If STOP is passed the avahi-autoipd is being shutdown and the action script should remove the IP address. In short: on BIND the address should be added to the interface, on CONFLICT, UNBIND or STOP it should be removed. 
 .TP
 \fBargv[2]\f1 The network interface name.
 .TP
diff --git a/man/avahi-autoipd.action.8.xml.in b/man/avahi-autoipd.action.8.xml.in
index 9dea446..5e4986f 100644
--- a/man/avahi-autoipd.action.8.xml.in
+++ b/man/avahi-autoipd.action.8.xml.in
@@ -40,7 +40,7 @@
       <option>
         <p><opt>argv[1]</opt> An event string: one of BIND, CONFLICT,
         UNBIND or STOP. If BIND is passed an IP address has been
-        sucessfully acquired and the script shall add it to the
+        successfully acquired and the script shall add it to the
         network interface. If CONFLICT is passed avahi-autopid
         detected a IP address on the local network, the action script
         should remove the configured IP address. If UNBIND is passed
diff --git a/man/avahi-daemon.8 b/man/avahi-daemon.8
index 0fbb831..1e5b9b2 100644
--- a/man/avahi-daemon.8
+++ b/man/avahi-daemon.8
@@ -61,7 +61,7 @@ Show version information
 
 \fI/etc/avahi/services/*.service\f1: static service definitions, see \fBavahi.service(5)\f1 for more information.
 .SH SIGNALS
-\fISIGINT, SIGTERM, SIGQUIT\f1: avahi-daemon will shutdown. (Same as \fB--kill\f1).
+\fISIGINT, SIGTERM\f1: avahi-daemon will shutdown. (Same as \fB--kill\f1).
 
 \fISIGHUP\f1: avahi-daemon will reload unicast DNS server data from \fI/etc/resolv.conf\f1 and static service definitions from \fI/etc/avahi/services/\f1. (Same as \fB--reload\f1)
 
diff --git a/man/avahi-daemon.8.xml.in b/man/avahi-daemon.8.xml.in
index e93fc73..0c2990d 100644
--- a/man/avahi-daemon.8.xml.in
+++ b/man/avahi-daemon.8.xml.in
@@ -142,7 +142,7 @@
     </section>
 
     <section name="Signals">
-      <p><arg>SIGINT, SIGTERM, SIGQUIT</arg>: avahi-daemon will shutdown. (Same as <opt>--kill</opt>).</p>
+      <p><arg>SIGINT, SIGTERM</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>
diff --git a/man/avahi-dnsconfd.8 b/man/avahi-dnsconfd.8
index 8b7fd2e..418ae36 100644
--- a/man/avahi-dnsconfd.8
+++ b/man/avahi-dnsconfd.8
@@ -37,7 +37,7 @@ Show version information
 .SH FILES
 \fI/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed.
 .SH SIGNALS
-\fISIGINT, SIGTERM, SIGQUIT\f1: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon.
+\fISIGINT, SIGTERM\f1: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon.
 
 \fISIGHUP\f1: avahi-dnsconfd will refresh the DNS server data.
 .SH AUTHORS
diff --git a/man/avahi-dnsconfd.8.xml.in b/man/avahi-dnsconfd.8.xml.in
index e01ab44..7b09cd4 100644
--- a/man/avahi-dnsconfd.8.xml.in
+++ b/man/avahi-dnsconfd.8.xml.in
@@ -84,7 +84,7 @@
     </section>
 
     <section name="Signals">
-      <p><arg>SIGINT, SIGTERM, SIGQUIT</arg>: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon.</p>
+      <p><arg>SIGINT, SIGTERM</arg>: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon.</p>
       <p><arg>SIGHUP</arg>: avahi-dnsconfd will refresh the DNS server data.</p>
     </section>