=== modified file 'Makefile'
--- Makefile	2008-08-19 13:25:14 +0000
+++ Makefile	2008-08-19 23:44:17 +0000
@@ -32,13 +32,16 @@
 	$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 LDFLAGS=$(COVERAGE)
 
-DOCBOOKTOMAN=xsltproc --nonet --xinclude \
+# Commands to format a DocBook refentry document into a manual page
+DOCBOOKTOMAN=cd $(dir $^); xsltproc --nonet --xinclude \
 	--param man.charmap.use.subset		0 \
 	--param make.year.ranges		1 \
 	--param make.single.year.ranges		1 \
 	--param man.output.quietly		1 \
 	--param man.authors.section.enabled	0 \
-	 /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
+	 /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
+	$(notdir $<); \
+	$(MANPOST) $(notdir $@)
 # DocBook-to-man post-processing to fix a \n escape bug
 MANPOST=sed --in-place --expression='s,\\en,\en,g;s,\\een,\\en,g'
 
@@ -56,13 +59,19 @@
 doc: $(DOCS)
 
 %.5: %.xml
-	cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
+	$(DOCBOOKTOMAN)
 
 %.8: %.xml
-	cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
+	$(DOCBOOKTOMAN)
 
 %.8mandos: %.xml
-	cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
+	$(DOCBOOKTOMAN)
+
+mandos.8: mandos.xml mandos-options.xml
+	$(DOCBOOKTOMAN)
+
+mandos.conf.5: mandos.conf.xml mandos-options.xml
+	$(DOCBOOKTOMAN)
 
 plugins.d/password-request: plugins.d/password-request.o
 	$(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \

=== modified file 'mandos-keygen.xml'
--- mandos-keygen.xml	2008-08-18 05:24:20 +0000
+++ mandos-keygen.xml	2008-08-19 23:44:17 +0000
@@ -3,10 +3,9 @@
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "mandos-keygen">
-<!ENTITY OVERVIEW SYSTEM "overview.xml">
 ]>
 
-<refentry>
+<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
     <title>&COMMANDNAME;</title>
     <!-- NWalsh's docbook scripts use this to generate the footer: -->
@@ -269,7 +268,7 @@
 
   <refsect1 id="overview">
     <title>OVERVIEW</title>
-    &OVERVIEW;
+    <xi:include href="overview.xml"/>
     <para>
       This program is a small program to generate new OpenPGP keys for
       new Mandos clients.

=== modified file 'mandos-options.xml'
--- mandos-options.xml	2008-08-19 13:25:14 +0000
+++ mandos-options.xml	2008-08-19 23:44:17 +0000
@@ -7,7 +7,7 @@
 options can be used both on the command line and in the config file.
 -->
 
-<simplesect>
+<section>
   <title/>
   
   <para id="interface">
@@ -21,13 +21,13 @@
   
   <para id="address">
     If this option is used, the server will only listen to a specific
-    address.  This must currently be an IPv6 address; an IPv4 address
-    can only be specified using the <quote><systemitem
-    class="ipaddress">::FFFF:192.0.2.3</systemitem></quote> format.
-    Also, if a link-local address is specified, an interface should be
-    set, since a link-local address is only valid on a single
-    interface.  By default, the server will listen to all available
-    addresses.
+    address.  If a link-local address is specified, an interface
+    should be set, since a link-local address is only valid on a
+    single interface.  By default, the server will listen to all
+    available addresses.  Also, this must currently be an IPv6
+    address; an IPv4 address can only be specified using the
+    <quote><systemitem class="ipaddress">::FFFF:192.0.2.3</systemitem
+    ></quote> format.
   </para>
   
   <para id="port">
@@ -63,4 +63,4 @@
     so on; therefore, this option is not needed in that case.
   </para>
   
-</simplesect>
+</section>

=== modified file 'mandos.conf.xml'
--- mandos.conf.xml	2008-08-19 13:25:14 +0000
+++ mandos.conf.xml	2008-08-19 23:44:17 +0000
@@ -103,8 +103,8 @@
       <varlistentry>
 	<term><varname>interface</varname></term>
 	<listitem>
-	  <synopsis><literal>interface = </literal><arg
-	  choice="plain"><replaceable>IF</replaceable></arg>
+	  <synopsis><literal>interface = </literal><replaceable
+	  >IF</replaceable>
 	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="interface"/>
 	</listitem>
@@ -113,8 +113,8 @@
       <varlistentry>
 	<term><varname>address</varname></term>
 	<listitem>
-	  <synopsis><literal>address = </literal><arg
-	  choice="plain"><replaceable>ADDRESS</replaceable></arg>
+	  <synopsis><literal>address = </literal><replaceable
+	  >ADDRESS</replaceable>
 	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="address"/>
 	</listitem>
@@ -123,8 +123,8 @@
       <varlistentry>
 	<term><varname>port</varname></term>
 	<listitem>
-	  <synopsis><literal>port = </literal><arg
-	  choice="plain"><replaceable>PORT</replaceable></arg>
+	  <synopsis><literal>port = </literal><replaceable
+	  >PORT</replaceable>
 	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="port"/>
 	</listitem>
@@ -133,16 +133,11 @@
       <varlistentry>
 	<term><varname>debug</varname></term>
 	<listitem>
-	  <synopsis><literal>debug =</literal><group choice="req">
-	    <arg choice="plain">1</arg>
-	    <arg choice="plain">yes</arg>
-	    <arg choice="plain">true</arg>
-	    <arg choice="plain">on</arg>
-	    <arg choice="plain">0</arg>
-	    <arg choice="plain">no</arg>
-	    <arg choice="plain">false</arg>
-	    <arg choice="plain">off</arg>
-	  </group>
+	  <synopsis><literal>debug = </literal>{ <literal
+	  >1</literal> | <literal>yes</literal> | <literal
+	  >true</literal> | <literal>on</literal> | <literal
+	  >0</literal> | <literal>no</literal> | <literal
+	  >false</literal> | <literal>off</literal> }
 	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="debug"/>
 	</listitem>
@@ -151,8 +146,8 @@
       <varlistentry>
 	<term><varname>priority</varname></term>
 	<listitem>
-	  <synopsis><literal>priority = </literal><arg
-	  choice="plain"><replaceable>PRIORITY</replaceable></arg>
+	  <synopsis><literal>priority = </literal><replaceable
+	  >PRIORITY</replaceable>
 	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="priority"/>
 	</listitem>
@@ -160,10 +155,10 @@
 
       <varlistentry>
 	<term><varname>servicename</varname></term>
-	  <synopsis><literal>servicename = </literal><arg
-	  choice="plain"><replaceable>NAME</replaceable></arg>
+	<listitem>
+	  <synopsis><literal>servicename = </literal><replaceable
+	  >NAME</replaceable>
 	  </synopsis>
-	<listitem>
 	  <xi:include href="mandos-options.xml"
 		      xpointer="servicename"/>
 	</listitem>
@@ -183,7 +178,7 @@
     <title>BUGS</title>
     <para>
       The <literal>[DEFAULT]</literal> is necessary because the Python
-      module <systemitem class="library">ConfigParser</systemitem>
+      built-in module <systemitem class="library">ConfigParser</systemitem>
       requres it.
     </para>
   </refsect1>
@@ -191,6 +186,17 @@
   <refsect1 id="example">
     <title>EXAMPLE</title>
     <informalexample>
+      <para>
+	No options are actually required:
+      </para>
+      <programlisting>
+[DEFAULT]
+      </programlisting>
+    </informalexample>
+    <informalexample>
+      <para>
+	An example using all the options:
+      </para>
       <programlisting>
 [DEFAULT]
 # A configuration example
@@ -199,7 +205,7 @@
 port = 1025
 debug = true
 priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP
-servicename = Mandos
+servicename = Daena
       </programlisting>
     </informalexample>
   </refsect1>

=== modified file 'mandos.xml'
--- mandos.xml	2008-08-19 13:25:14 +0000
+++ mandos.xml	2008-08-19 23:44:17 +0000
@@ -274,7 +274,7 @@
 	<entry>-><!-- &rarr; --></entry>
       </row>
       <row>
-	<entry><quote><literal>1\r\en</literal></quote></entry>
+	<entry><quote><literal>1\r\n</literal></quote></entry>
 	<entry>-><!-- &rarr; --></entry>
       </row>
       <row>
@@ -310,8 +310,6 @@
       longer eligible to receive the encrypted password.  The timeout,
       checker program, and interval between checks can be configured
       both globally and per client; see <citerefentry>
-      <refentrytitle>mandos.conf</refentrytitle>
-      <manvolnum>5</manvolnum></citerefentry> and <citerefentry>
       <refentrytitle>mandos-clients.conf</refentrytitle>
       <manvolnum>5</manvolnum></citerefentry>.
     </para>
@@ -320,8 +318,8 @@
   <refsect1 id="logging">
     <title>LOGGING</title>
     <para>
-      The server will send log messaged with various severity levels
-      to <filename>/dev/log</filename>.  With the
+      The server will send log message with various severity levels to
+      <filename>/dev/log</filename>.  With the
       <option>--debug</option> option, it will log even more messages,
       and also show them on the console.
     </para>
@@ -348,7 +346,7 @@
 	    <varname>PATH</varname> to search for matching commands if
 	    an absolute path is not given.  See <citerefentry>
 	    <refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum>
-	  </citerefentry>
+	    </citerefentry>.
 	  </para>
 	</listitem>
       </varlistentry>