=== modified file 'TODO'
--- TODO	2008-08-29 16:53:41 +0000
+++ TODO	2008-08-30 18:45:41 +0000
@@ -93,8 +93,21 @@
    [[http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/examples/foo.1.example_manpage.xml?op=file&rev=0&sc=0][foo.1.example_manpage.xml]].  In particular:
 *** SYNOPSIS
     <arg> with inner <replaceable> and <option> tags
+**** DONE mandos-keygen.xml
+**** DONE plugins.d/password-request.xml
+**** TODO mandos.conf.xml
+**** TODO mandos.xml
+**** TODO plugin-runner.xml
+**** TODO plugins.d/password-prompt.xml
 *** OPTIONS
     Separate <term> tags with <option> and <replaceable> tags
+**** DONE mandos-clients.conf.xml
+**** TODO mandos-keygen.xml
+**** DONE mandos.conf.xml
+**** TODO mandos.xml
+**** TODO plugin-runner.xml
+**** TODO plugins.d/password-prompt.xml
+**** TODO plugins.d/password-request.xml
 ** Use xinclude for common sections
    Like copyright, authors, etc.
 

=== modified file 'mandos-clients.conf.xml'
--- mandos-clients.conf.xml	2008-08-30 17:16:33 +0000
+++ mandos-clients.conf.xml	2008-08-30 18:45:41 +0000
@@ -73,9 +73,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <synopsis>
-      &CONFPATH;
-    </synopsis>
+    <synopsis>&CONFPATH;</synopsis>
   </refsynopsisdiv>
 
   <refsect1 id="description">
@@ -123,11 +121,9 @@
     <variablelist>
 
       <varlistentry>
-	<term><literal><varname>timeout</varname></literal></term>
+	<term><option>timeout<literal> = </literal><replaceable
+	>TIME</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>timeout = </literal><replaceable
-	  >TIME</replaceable>
-	  </synopsis>
 	  <para>
 	    The timeout is how long the server will wait for a
 	    successful checker run until a client is considered
@@ -151,11 +147,9 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal><varname>interval</varname></literal></term>
+	<term><option>interval<literal> = </literal><replaceable
+	>TIME</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>interval = </literal><replaceable
-	  >TIME</replaceable>
-	  </synopsis>
 	  <para>
 	    How often to run the checker to confirm that a client is
 	    still up.  <emphasis>Note:</emphasis> a new checker will
@@ -173,11 +167,9 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>checker</literal></term>
+	<term><option>checker<literal> = </literal><replaceable
+	>COMMAND</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>checker = </literal><replaceable
-	  >COMMAND</replaceable>
-	  </synopsis>
 	  <para>
 	    This option allows you to override the default shell
 	    command that the server will use to check if the client is
@@ -200,11 +192,9 @@
       </varlistentry>
       
       <varlistentry>
-	<term><literal>fingerprint</literal></term>
+	<term><option>fingerprint<literal> = </literal
+	><replaceable>HEXSTRING</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>fingerprint = </literal><replaceable
-	  >HEXSTRING</replaceable>
-	  </synopsis>
 	  <para>
 	    This option sets the OpenPGP fingerprint that identifies
 	    the public key that clients authenticate themselves with
@@ -215,11 +205,9 @@
       </varlistentry>
       
       <varlistentry>
-	<term><literal>secret</literal></term>
+	<term><option>secret<literal> = </literal><replaceable
+	>BASE64_ENCODED_DATA</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>secret = </literal><replaceable
-	  >BASE64_ENCODED_DATA</replaceable>
-	  </synopsis>
 	  <para>
 	    If present, this option must be set to a string of
 	    base64-encoded binary data.  It will be decoded and sent
@@ -247,16 +235,14 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>secfile</literal></term>
+	<term><option>secfile<literal> = </literal><replaceable
+	>FILENAME</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>secfile = </literal><replaceable
-	  >FILENAME</replaceable>
-	  </synopsis>
 	  <para>
-	    The same as <option>secret</option>, but the secret data
-	    is in an external file.  The contents of the file should
-	    <emphasis>not</emphasis> be base64-encoded, but will be
-	    sent to clients verbatim.
+	    Similar to the <option>secret</option>, except the secret
+	    data is in an external file.  The contents of the file
+	    should <emphasis>not</emphasis> be base64-encoded, but
+	    will be sent to clients verbatim.
 	  </para>
 	  <para>
 	    This option is only used, and <emphasis>must</emphasis> be
@@ -266,11 +252,9 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>host</literal></term>
+	<term><option><literal>host = </literal><replaceable
+	>STRING</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>host = </literal><replaceable
-	  >STRING</replaceable>
-	  </synopsis>
 	  <para>
 	    Host name for this client.  This is not used by the server
 	    directly, but can be, and is by default, used by the
@@ -329,7 +313,7 @@
 	percent characters in a row (<quote>%%%%</quote>) must be
 	entered.  Also, a bad format here will lead to an immediate
 	but <emphasis>silent</emphasis> run-time fatal exit; debug
-	mode is needed to track down an error of this kind.
+	mode is needed to expose an error of this kind.
       </para>
     </refsect2>
 

=== modified file 'mandos-options.xml'
--- mandos-options.xml	2008-08-30 11:31:37 +0000
+++ mandos-options.xml	2008-08-30 18:45:41 +0000
@@ -15,8 +15,8 @@
     and listen to requests on the specified network interface.
     Default is to use all available interfaces.  <emphasis
     >Note:</emphasis> a failure to bind to the specified
-    interface is not considered critical, and the server does not
-    exit, but will instead continue normally.
+    interface is not considered critical, and the server will not
+    exit, but instead continue normally.
   </para>
   
   <para id="address">

=== modified file 'mandos.conf.xml'
--- mandos.conf.xml	2008-08-29 07:30:17 +0000
+++ mandos.conf.xml	2008-08-30 18:45:41 +0000
@@ -4,7 +4,7 @@
 <!ENTITY VERSION "1.0">
 <!ENTITY CONFNAME "mandos.conf">
 <!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
-<!ENTITY TIMESTAMP "2008-08-29">
+<!ENTITY TIMESTAMP "2008-08-30">
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -73,9 +73,7 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <synopsis>
-      &CONFPATH;
-    </synopsis>
+    <synopsis>&CONFPATH;</synopsis>
   </refsynopsisdiv>
 
   <refsect1 id="description">
@@ -102,64 +100,52 @@
     
     <variablelist>
       <varlistentry>
-	<term><varname>interface</varname></term>
+	<term><option>interface<literal> = </literal><replaceable
+	>NAME</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>interface = </literal><replaceable
-	  >NAME</replaceable>
-	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="interface"/>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><varname>address</varname></term>
+	<term><option>address<literal> = </literal><replaceable
+	  >ADDRESS</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>address = </literal><replaceable
-	  >ADDRESS</replaceable>
-	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="address"/>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><varname>port</varname></term>
+	<term><option>port<literal> = </literal><replaceable
+	>NUMBER</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>port = </literal><replaceable
-	  >NUMBER</replaceable>
-	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="port"/>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><varname>debug</varname></term>
-	<listitem>
-	  <synopsis><literal>debug = </literal>{ <literal
+	<term><option>debug<literal> = </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>
+	  >false</literal> | <literal>off</literal> }</option></term>
+	<listitem>
 	  <xi:include href="mandos-options.xml" xpointer="debug"/>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><varname>priority</varname></term>
+	<term><option>priority<literal> = </literal><replaceable
+	>STRING</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>priority = </literal><replaceable
-	  >STRING</replaceable>
-	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="priority"/>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><varname>servicename</varname></term>
+	<term><option>servicename<literal> = </literal
+	><replaceable>NAME</replaceable></option></term>
 	<listitem>
-	  <synopsis><literal>servicename = </literal><replaceable
-	  >NAME</replaceable>
-	  </synopsis>
 	  <xi:include href="mandos-options.xml"
 		      xpointer="servicename"/>
 	</listitem>