added dtd

updated manpage


git-svn-id: file:///home/lennart/svn/public/ifplugd/trunk@60 2bf48fe7-cfc1-0310-909f-d9042e1e0fef

5 files changed, 50 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index c2524dd..eae1c32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ homepage: all dist
 	test -d $$HOME/homepage/lennart
 	mkdir -p $$HOME/homepage/lennart/projects/ifplugd
 	cp *.tar.gz $$HOME/homepage/lennart/projects/ifplugd
-	cp man/ifplugd.8.xml man/ifstatus.8.xml man/ifplugd.conf.5.xml man/xmltoman.css man/xmltoman.xsl doc/README.html doc/style.css doc/NEWS $$HOME/homepage/lennart/projects/ifplugd
+	cp man/ifplugd.8.xml man/ifstatus.8.xml man/ifplugd.conf.5.xml man/xmltoman.css man/xmltoman.xsl man/xmltoman.dtd doc/README.html doc/style.css doc/NEWS $$HOME/homepage/lennart/projects/ifplugd
 	cp $$HOME/homepage/lennart/projects/ifplugd/README.html $$HOME/homepage/lennart/projects/ifplugd/index.html
 
 
diff --git a/doc/NEWS b/doc/NEWS
index 0594992..f9f71b3 100644
--- a/doc/NEWS
+++ b/doc/NEWS
@@ -1,4 +1,4 @@
-0.19 :: 20 Oct 2003 :: SVN 59
+0.19 :: 20 Oct 2003 :: SVN 60
 	--wait-for-kill fix
 	minor documentation updates, other fixes
 	
diff --git a/man/Makefile.am b/man/Makefile.am
index b6e4c3a..0d39ef5 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -20,7 +20,7 @@ man_MANS = ifplugd.8 ifplugd.conf.5 ifstatus.8
 
 noinst_DATA = ifplugd.8.xml ifplugd.conf.5.xml ifstatus.8.xml  
 
-EXTRA_DIST = $(man_MANS) ifplugd.8.xml.in ifplugd.conf.5.xml.in ifstatus.8.xml.in xmltoman.css xmltoman.xsl
+EXTRA_DIST = $(man_MANS) ifplugd.8.xml.in ifplugd.conf.5.xml.in ifstatus.8.xml.in xmltoman.css xmltoman.xsl xmltoman.dtd
 
 CLEANFILES = ifplugd.8.xml ifplugd.conf.5.xml ifstatus.8.xml  
 
diff --git a/man/ifplugd.8.xml.in b/man/ifplugd.8.xml.in
index 8410f6d..cd47bd1 100644
--- a/man/ifplugd.8.xml.in
+++ b/man/ifplugd.8.xml.in
@@ -161,6 +161,14 @@
 	  </option>
 
 	  <option>
+		<p><opt>-W | --wait-on-kill</opt></p> 
+
+		<optdesc><p> When killing a running daemon (with -k) wait
+		until the daemon died.
+        </p></optdesc>
+	  </option>
+
+	  <option>
 		<p><opt>-x | --extra-arg=</opt> <arg>ARG</arg></p>
 		<optdesc><p>
 			Specify an extra argument to be passed to the action script.
diff --git a/man/xmltoman.dtd b/man/xmltoman.dtd
new file mode 100644
index 0000000..39cfa28
--- /dev/null
+++ b/man/xmltoman.dtd
@@ -0,0 +1,39 @@
+<!-- $Id$ -->
+
+<!-- 
+  This file is part of ifplugd.
+
+  ifplugd is free software; you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free
+  Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  ifplugd 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 General Public License
+  for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with ifplugd; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. 
+-->
+
+<!ELEMENT manpage (synopsis | description | section | options | seealso)*>
+<!ATTLIST manpage name CDATA #REQUIRED section CDATA #REQUIRED desc CDATA #IMPLIED>
+<!ELEMENT arg (#PCDATA)>
+<!ELEMENT p (#PCDATA | arg | url | manref | opt | file )*>
+<!ELEMENT synopsis (cmd | p)+>
+<!ELEMENT description (p)+>
+<!ELEMENT section (p | option)*>
+<!ATTLIST section name CDATA #REQUIRED>
+<!ELEMENT option (#PCDATA | p | optdesc)*>
+<!ELEMENT optdesc (#PCDATA | p )*>
+<!ELEMENT cmd (#PCDATA | arg)*>
+<!ELEMENT options (p | option)*>
+<!ELEMENT seealso (p)*>
+<!ELEMENT opt (#PCDATA)>
+<!ELEMENT file (#PCDATA)>
+<!ELEMENT manref EMPTY>
+<!ATTLIST manref name CDATA #REQUIRED section CDATA #REQUIRED href CDATA #IMPLIED>
+<!ELEMENT url EMPTY>
+<!ATTLIST url href CDATA #REQUIRED>