From 908e491f7d55209acfbb2595ab1ef5b24502d641 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 25 Jun 2010 03:10:32 +0200
Subject: get rid of a lot of old svn cruft

---
 man/Makefile.am                    |  2 --
 man/avahi-autoipd.8.xml.in         | 26 ++++++++++++--------------
 man/avahi-autoipd.action.8.xml.in  | 20 +++++++++-----------
 man/avahi-bookmarks.1.xml.in       | 26 ++++++++++++--------------
 man/avahi-browse.1.xml.in          |  2 --
 man/avahi-daemon.8.xml.in          | 26 ++++++++++++--------------
 man/avahi-daemon.conf.5.xml.in     |  2 --
 man/avahi-discover.1.xml.in        | 24 +++++++++++-------------
 man/avahi-dnsconfd.8.xml.in        | 24 +++++++++++-------------
 man/avahi-dnsconfd.action.8.xml.in | 24 +++++++++++-------------
 man/avahi-publish.1.xml.in         | 24 +++++++++++-------------
 man/avahi-resolve.1.xml.in         | 24 +++++++++++-------------
 man/avahi-set-host-name.1.xml.in   | 22 ++++++++++------------
 man/avahi.hosts.5.xml.in           | 18 ++++++++----------
 man/avahi.service.5.xml.in         | 22 ++++++++++------------
 man/bssh.1.xml.in                  |  2 --
 man/xmltoman.css                   |  2 --
 man/xmltoman.dtd                   |  6 ++----
 man/xmltoman.xsl                   |  2 --
 19 files changed, 130 insertions(+), 168 deletions(-)

(limited to 'man')

diff --git a/man/Makefile.am b/man/Makefile.am
index 5b089ed..d38267c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
diff --git a/man/avahi-autoipd.8.xml.in b/man/avahi-autoipd.8.xml.in
index 2e7bb67..43177a5 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
@@ -56,7 +54,7 @@
 
       <p>See http://developer.apple.com/qa/qa2004/qa1357.html for more information.</p>
 	</description>
-	
+
 	<options>
 
 	  <option>
@@ -108,7 +106,7 @@
         <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>
       </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>
@@ -135,9 +133,9 @@
 	</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">
@@ -149,7 +147,7 @@
 	  <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"/>
@@ -157,10 +155,10 @@
 
       <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>
diff --git a/man/avahi-autoipd.action.8.xml.in b/man/avahi-autoipd.action.8.xml.in
index 1eb6750..9dea446 100644
--- a/man/avahi-autoipd.action.8.xml.in
+++ b/man/avahi-autoipd.action.8.xml.in
@@ -2,21 +2,19 @@
 <!DOCTYPE manpage SYSTEM "xmltoman.dtd">
 <?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
 
-<!-- $Id: avahi-autoipd.action.8.xml.in 263 2005-08-07 19:53:39Z lennart $ -->
-
-<!-- 
+<!--
   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
@@ -28,7 +26,7 @@
 	<synopsis>
       <cmd>@pkgsysconfdir@/avahi-autoipd.action</cmd>
 	</synopsis>
-	
+
     <description>
       <p><file>avahi-autoipd.action</file> is the action script that
       is called whenever an IP address has been acquired by
@@ -36,7 +34,7 @@
       script should add or remove the specified address from the
       specified network interface.</p>
 	</description>
-	
+
 	<section name="Parameters">
 
       <option>
@@ -70,16 +68,16 @@
 	  <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-autoipd" section="8"/>, <manref name="dhclient-script" section="8"/>, <manref name="ip" section="8"/>, <manref name="ifconfig" section="8"/>
 	  </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>
diff --git a/man/avahi-bookmarks.1.xml.in b/man/avahi-bookmarks.1.xml.in
index 9bebd76..d863e2b 100644
--- a/man/avahi-bookmarks.1.xml.in
+++ b/man/avahi-bookmarks.1.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
@@ -28,7 +26,7 @@
 	<synopsis>
       <cmd>avahi-bookmarks</cmd>
 	</synopsis>
-	
+
     <description>
       <p>A web service for listing HTTP services that are announced
       via mDNS/DNS-SD using the Avahi daemon. avahi-bookmarks opens a
@@ -36,9 +34,9 @@
       returning a dynamic web site containing links to all services of
       type _http._tcp on the LAN. Point your browser to
       http://localhost:8080/ to make use of avahi-bookmarks.</p>
-      
+
 	</description>
-	
+
     <options>
       <option>
         <p><opt>-p | --port=</opt> <arg>PORT</arg></p>
@@ -69,11 +67,11 @@
         locally. This option conflicts with -H.</p></optdesc>
       </option>
 
-    
+
       <option>
         <p><opt>-d | --domain</opt>=<arg>DOMAIN</arg></p>
         <optdesc><p>The domain to browse for services in.</p></optdesc>
-      </option> 
+      </option>
 
 	  <option>
 		<p><opt>-h | --help</opt></p>
@@ -86,16 +84,16 @@
 	  <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-browse" section="1"/>, <manref name="avahi-daemon" section="8"/>
 	  </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>
diff --git a/man/avahi-browse.1.xml.in b/man/avahi-browse.1.xml.in
index df4924b..b13d4fc 100644
--- a/man/avahi-browse.1.xml.in
+++ b/man/avahi-browse.1.xml.in
@@ -2,8 +2,6 @@
 <!DOCTYPE manpage SYSTEM "xmltoman.dtd">
 <?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
 
-<!-- $Id$ -->
-
 <!--
   This file is part of avahi.
 
diff --git a/man/avahi-daemon.8.xml.in b/man/avahi-daemon.8.xml.in
index b45e8c1..7e8e2d9 100644
--- a/man/avahi-daemon.8.xml.in
+++ b/man/avahi-daemon.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-daemon <opt>--reload</opt></cmd>
       <cmd>avahi-daemon <opt>--check</opt></cmd>
 	</synopsis>
-	
+
     <description>
       <p>The Avahi mDNS/DNS-SD daemon implements Apple's Zeroconf
       architecture (also known as "Rendezvous" or "Bonjour"). The daemon
@@ -44,7 +42,7 @@
       (a libc NSS plugin, providing name resolution via mDNS). Finally
       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
@@ -53,7 +51,7 @@
       <file>avahi-daemon.conf</file> the file
       <file>/etc/resolv.conf</file> will be read, too.</p>
 	</description>
-	
+
 	<options>
 
 	  <option>
@@ -134,13 +132,13 @@
 	</options>
 
     <section name="Files">
-      
+
       <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>@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">
@@ -155,7 +153,7 @@
 	  <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-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"/>
@@ -163,10 +161,10 @@
 
       <p>http://avahi.org/wiki/AvahiAndUnicastDotLocal documents the problems when using Avahi in a unicast DNS zone .local.</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>
diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
index baa9a21..7e44690 100644
--- a/man/avahi-daemon.conf.5.xml.in
+++ b/man/avahi-daemon.conf.5.xml.in
@@ -2,8 +2,6 @@
 <!DOCTYPE manpage SYSTEM "xmltoman.dtd">
 <?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
 
-<!-- $Id$ -->
-
 <!--
   This file is part of avahi.
 
diff --git a/man/avahi-discover.1.xml.in b/man/avahi-discover.1.xml.in
index 5d4f878..e311f1f 100644
--- a/man/avahi-discover.1.xml.in
+++ b/man/avahi-discover.1.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
@@ -28,34 +26,34 @@
 	<synopsis>
       <cmd>avahi-discover</cmd>
 	</synopsis>
-	
+
     <description>
       <p>Show a real-time graphical browse list for mDNS/DNS-SD
       network services running on the local LAN using the Avahi
       daemon.</p>
-      
+
 	</description>
-	
+
 	<options>
 
       <p>avahi-discover takes no command line arguments at the moment.</p>
 
     </options>
-	
+
 	<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="avahi-daemon" section="8"/>, <manref name="avahi-browse" section="1"/>
 	  </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>
diff --git a/man/avahi-dnsconfd.8.xml.in b/man/avahi-dnsconfd.8.xml.in
index c74e1ba..b40c676 100644
--- a/man/avahi-dnsconfd.8.xml.in
+++ b/man/avahi-dnsconfd.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-dnsconfd <opt>--refresh</opt></cmd>
       <cmd>avahi-dnsconfd <opt>--check</opt></cmd>
 	</synopsis>
-	
+
     <description>
       <p>avahi-dnsconfd connects to a running avahi-daemon and runs
       the script <file>@pkgsysconfdir@/dnsconfd.action</file> for each unicast DNS
@@ -39,7 +37,7 @@
       configuring unicast DNS servers in a DHCP-like fashion with
       mDNS.</p>
 	</description>
-	
+
 	<options>
 
 	  <option>
@@ -75,9 +73,9 @@
 	</options>
 
     <section name="Files">
-      
+
       <p><file>@pkgsysconfdir@/avahi-dnsconfd.action</file>: the script to run when a DNS server is found or removed.</p>
-    
+
     </section>
 
     <section name="Signals">
@@ -89,16 +87,16 @@
 	  <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-daemon" section="8"/>, <manref name="avahi-dnsconfd.action" section="8"/>
 	  </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>
diff --git a/man/avahi-dnsconfd.action.8.xml.in b/man/avahi-dnsconfd.action.8.xml.in
index 6811422..f4ae37e 100644
--- a/man/avahi-dnsconfd.action.8.xml.in
+++ b/man/avahi-dnsconfd.action.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
@@ -28,7 +26,7 @@
 	<synopsis>
       <cmd>@pkgsysconfdir@/avahi-dnsconfd.action</cmd>
 	</synopsis>
-	
+
     <description>
       <p><file>avahi-dnsconfd.action</file> is the action script that
       is called whenever a new unicast DNS server is found or
@@ -36,7 +34,7 @@
       with avahi patches <file>/etc/resolv.conf</file> to reflect the
       changed unicast DNS server configuration.</p>
 	</description>
-	
+
 	<section name="Parameters">
 
       <option>
@@ -61,7 +59,7 @@
       <option>
         <p><opt>AVAHI_INTERFACE</opt> Contains the textual interface name the corresponds with argv[3]. (e.g. "eth0")</p>
       </option>
-      
+
       <option><p><opt>AVAHI_INTERFACE_DNS_SERVERS</opt> Contains a
       list of all DNS servers that avahi-dnsconfd found on the
       interface <opt>$AVAHI_INTERFACE</opt>, separated by
@@ -71,22 +69,22 @@
       DNS server that avahi-dnsconfd found on all interfaces,
       separated by spaces.</p></option>
 
-    </section>  
+    </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="avahi-dnsconfd" section="8"/>, <manref name="avahi-daemon" section="8"/>
 	  </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>
diff --git a/man/avahi-publish.1.xml.in b/man/avahi-publish.1.xml.in
index 5ab476a..bb8dbda 100644
--- a/man/avahi-publish.1.xml.in
+++ b/man/avahi-publish.1.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,11 +29,11 @@
       <cmd>avahi-publish -a [<arg>options</arg>] <arg>host name</arg> <arg>address</arg></cmd>
       <cmd>avahi-publish-address [<arg>options</arg>] <arg>host name</arg> <arg>address</arg></cmd>
 	</synopsis>
-	
+
     <description>
       <p>Register an mDNS/DNS-SD service or host name/address mapping using the Avahi daemon.</p>
 	</description>
-	
+
 	<options>
 
       <p>When calling in service registration mode, specify a DNS-SD
@@ -45,7 +43,7 @@
       command line. When calling in address/host name registration
       mode specify a fully qualified host name and an address (IPv4 or
       IPv6).</p>
-	  
+
 	  <option>
         <p><opt>-s | --service</opt></p>
         <optdesc><p>Register a service. avahi-publish-service is equivalent to avahi-publish -s.</p></optdesc>
@@ -102,12 +100,12 @@
 	  </option>
 
 	</options>
-	
+
 	<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="avahi-resolve" section="1"/>, <manref
@@ -115,10 +113,10 @@
         name="avahi-daemon" section="8"/>
 	  </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>
diff --git a/man/avahi-resolve.1.xml.in b/man/avahi-resolve.1.xml.in
index 3f9bbc6..e444cb9 100644
--- a/man/avahi-resolve.1.xml.in
+++ b/man/avahi-resolve.1.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,13 +29,13 @@
       <cmd>avahi-resolve --address <arg>address ...</arg></cmd>
       <cmd>avahi-resolve-address <arg>address ...</arg></cmd>
 	</synopsis>
-	
+
     <description>
       <p>Resolve one or more mDNS/DNS host name(s) to IP address(es) (and vice versa) using the Avahi daemon.</p>
 	</description>
-	
+
 	<options>
-      
+
       <p>When passing -n, specify one or more fully qualified mDNS/DNS host name(s)
       (e.g. "foo.local") to resolve into IP addresses on the
       command line. When passing -a, specify one or more IP address
@@ -90,18 +88,18 @@
 	  <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-publish-address" section="1"/>, 
+        <manref name="avahi-publish-address" section="1"/>,
         <manref
         name="avahi-daemon" section="8"/>
 	  </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>
diff --git a/man/avahi-set-host-name.1.xml.in b/man/avahi-set-host-name.1.xml.in
index a49db10..407bbe7 100644
--- a/man/avahi-set-host-name.1.xml.in
+++ b/man/avahi-set-host-name.1.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
@@ -28,15 +26,15 @@
 	<synopsis>
       <cmd>avahi-set-host-name <arg>host-name</arg></cmd>
 	</synopsis>
-	
+
     <description>
       <p>Set the mDNS host name of a currently running Avahi
       daemon. The effect of this operation is not persistent across
       daemon restarts. This operation is usually privileged.</p>
 	</description>
-	
+
 	<options>
-      
+
       <option>
         <p><opt>-v | --verbose</opt></p>
         <optdesc><p>Enable verbose mode.</p></optdesc>
@@ -60,16 +58,16 @@
 	  <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-daemon" section="8"/>
 	  </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>
diff --git a/man/avahi.hosts.5.xml.in b/man/avahi.hosts.5.xml.in
index 5a92547..eff2848 100644
--- a/man/avahi.hosts.5.xml.in
+++ b/man/avahi.hosts.5.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
@@ -28,7 +26,7 @@
 	<synopsis>
       <cmd>@pkgsysconfdir@/hosts</cmd>
 	</synopsis>
-	
+
     <description>
       <p><file>@pkgsysconfdir@/hosts</file> is a file which may be used
       to define static host name to IP address mappings for multicast
@@ -46,17 +44,17 @@
 	  <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-daemon" section="8"/>, <manref name="avahi.service" section="5"/>
 	  </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>
diff --git a/man/avahi.service.5.xml.in b/man/avahi.service.5.xml.in
index 0005903..6598617 100644
--- a/man/avahi.service.5.xml.in
+++ b/man/avahi.service.5.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
@@ -28,16 +26,16 @@
 	<synopsis>
       <cmd>@servicedir@/*.service</cmd>
 	</synopsis>
-	
+
     <description> <p><file>@servicedir@/*.service</file> are XML
       fragments containing static DNS-SD service data. Every service
       file can contain multiple service definitions which share the
       same name. This is useful for publishing service data for
       services which implement multiple protocols. (i.e. a printer
       implementing _ipp._tcp and _printer._tcp)</p> </description>
-	
+
 	<section name="XML Tags">
-      
+
       <option>
         <p><opt>&lt;service-group&gt;</opt> The document tag of avahi
         service files. Should contain one <opt>&lt;name&gt;</opt> and one or more
@@ -108,17 +106,17 @@
 	  <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-daemon" section="8"/>, <manref name="avahi.hosts" section="5"/>
 	  </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>
diff --git a/man/bssh.1.xml.in b/man/bssh.1.xml.in
index 2a3fdcf..6df640d 100644
--- a/man/bssh.1.xml.in
+++ b/man/bssh.1.xml.in
@@ -2,8 +2,6 @@
 <!DOCTYPE manpage SYSTEM "xmltoman.dtd">
 <?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?>
 
-<!-- $Id$ -->
-
 <!--
   This file is part of avahi.
 
diff --git a/man/xmltoman.css b/man/xmltoman.css
index 4c80847..6b3235b 100644
--- a/man/xmltoman.css
+++ b/man/xmltoman.css
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
 
diff --git a/man/xmltoman.dtd b/man/xmltoman.dtd
index 50158dc..968dd5f 100644
--- a/man/xmltoman.dtd
+++ b/man/xmltoman.dtd
@@ -1,6 +1,4 @@
-<!-- $Id$ -->
-
-<!-- 
+<!--
   This file is part of avahi.
 
   avahi is free software; you can redistribute it and/or modify it under
@@ -15,7 +13,7 @@
 
   You should have received a copy of the GNU General Public License
   along with avahi; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. 
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 -->
 
 <!ELEMENT manpage (synopsis | description | section | options | seealso)*>
diff --git a/man/xmltoman.xsl b/man/xmltoman.xsl
index 96c9d81..1a344c2 100644
--- a/man/xmltoman.xsl
+++ b/man/xmltoman.xsl
@@ -19,8 +19,6 @@
   Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. 
 -->
 
-<!-- $Id$ -->
-
 <xsl:output method="xml" version="1.0" encoding="iso-8859-15" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes"/>
 
 <xsl:template match="/manpage">
-- 
cgit