=== modified file 'Makefile'
--- Makefile	2008-08-25 06:44:13 +0000
+++ Makefile	2008-08-31 15:06:39 +0000
@@ -58,13 +58,13 @@
 
 doc: $(DOCS)
 
-%.5: %.xml
-	$(DOCBOOKTOMAN)
-
-%.8: %.xml
-	$(DOCBOOKTOMAN)
-
-%.8mandos: %.xml
+%.5: %.xml legalnotice.xml
+	$(DOCBOOKTOMAN)
+
+%.8: %.xml legalnotice.xml
+	$(DOCBOOKTOMAN)
+
+%.8mandos: %.xml legalnotice.xml
 	$(DOCBOOKTOMAN)
 
 mandos.8: mandos.xml mandos-options.xml

=== modified file 'TODO'
--- TODO	2008-08-30 19:49:24 +0000
+++ TODO	2008-08-31 15:06:39 +0000
@@ -88,29 +88,8 @@
 ** Enable client
 
 * Man pages
-** Tags
-   Go through all man pages to conform to the style of tags chosen in
-   [[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-clients.conf.xml
-**** DONE mandos-keygen.xml
-**** DONE mandos.conf.xml
-**** DONE mandos.xml
-**** DONE plugin-runner.xml
-**** TODO plugins.d/password-prompt.xml
-**** DONE plugins.d/password-request.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.
+   Like authors, etc.
 
 
 * Installer

=== added file 'legalnotice.xml'
--- legalnotice.xml	1970-01-01 00:00:00 +0000
+++ legalnotice.xml	2008-08-31 15:06:39 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<legalnotice>
+  <para>
+    This manual page 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 3 of the
+    License, or (at your option) any later version.
+  </para>
+  
+  <para>
+    This manual page 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.
+  </para>
+  
+  <para>
+    You should have received a copy of the GNU General Public License
+    along with this program; If not, see <ulink
+    url="http://www.gnu.org/licenses/"/>.
+  </para>
+</legalnotice>

=== modified file 'mandos-clients.conf.xml'
--- mandos-clients.conf.xml	2008-08-30 18:45:41 +0000
+++ mandos-clients.conf.xml	2008-08-31 15:06:39 +0000
@@ -1,13 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY CONFNAME "mandos-clients.conf">
 <!ENTITY CONFPATH "<filename>/etc/mandos/clients.conf</filename>">
-<!ENTITY TIMESTAMP "2008-08-30">
+<!ENTITY TIMESTAMP "2008-08-31">
 ]>
 
-<refentry>
+<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
     <title>Mandos Manual</title>
     <!-- NWalsh’s docbook scripts use this to generate the footer: -->
@@ -35,29 +35,7 @@
       <holder>Teddy Hogeborn</holder>
       <holder>Björn Påhlsson</holder>
     </copyright>
-    <legalnotice>
-      <para>
-	This manual page 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 3 of the License, or (at your option) any
-	later version.
-      </para>
-
-      <para>
-	This manual page 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.
-      </para>
-
-      <para>
-	You should have received a copy of the GNU General Public
-	License along with this program; If not, see
-	<ulink url="http://www.gnu.org/licenses/"/>.
-      </para>
-    </legalnotice>
+    <xi:include href="legalnotice.xml"/>
   </refentryinfo>
 
   <refmeta>

=== modified file 'mandos-keygen'
--- mandos-keygen	2008-08-25 03:53:42 +0000
+++ mandos-keygen	2008-08-31 08:47:38 +0000
@@ -64,7 +64,7 @@
   -n NAME, --name NAME  Name of key.  Default is the FQDN.
   -e ADDRESS, --email ADDRESS
                         Email address of key.  Default is empty.
-  -c COMMENT, --comment COMMENT
+  -c TEXT, --comment TEXT
                         Comment field for key.  The default value is
                         "Mandos client key".
   -x TIME, --expire TIME
@@ -75,7 +75,7 @@
 Password creation options:
   -p, --password        Create an encrypted password using the keys in
                         the key directory.  All options other than
-                        --keydir and --name are ignored.
+                        --dir and --name are ignored.
 EOF
 }
 

=== modified file 'mandos-keygen.xml'
--- mandos-keygen.xml	2008-08-30 17:16:33 +0000
+++ mandos-keygen.xml	2008-08-31 15:06:39 +0000
@@ -3,7 +3,7 @@
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "mandos-keygen">
-<!ENTITY TIMESTAMP "2008-08-30">
+<!ENTITY TIMESTAMP "2008-08-31">
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -34,29 +34,7 @@
       <holder>Teddy Hogeborn</holder>
       <holder>Björn Påhlsson</holder>
     </copyright>
-    <legalnotice>
-      <para>
-	This manual page 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 3 of the License, or (at your option) any
-	later version.
-      </para>
-
-      <para>
-	This manual page 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.
-      </para>
-
-      <para>
-	You should have received a copy of the GNU General Public
-	License along with this program; If not, see
-	<ulink url="http://www.gnu.org/licenses/"/>.
-      </para>
-    </legalnotice>
+    <xi:include href="legalnotice.xml"/>
   </refentryinfo>
 
   <refmeta>
@@ -67,8 +45,7 @@
   <refnamediv>
     <refname><command>&COMMANDNAME;</command></refname>
     <refpurpose>
-      Generate keys for <citerefentry><refentrytitle>password-request
-      </refentrytitle><manvolnum>8mandos</manvolnum></citerefentry>
+      Generate key and password for Mandos client and server.
     </refpurpose>
   </refnamediv>
 
@@ -143,8 +120,8 @@
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
+	<arg choice="plain"><option>--password</option></arg>
 	<arg choice="plain"><option>-p</option></arg>
-	<arg choice="plain"><option>--password</option></arg>
       </group>
       <sbr/>
       <group>
@@ -164,56 +141,56 @@
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
+	<arg choice="plain"><option>--help</option></arg>
 	<arg choice="plain"><option>-h</option></arg>
-	<arg choice="plain"><option>--help</option></arg>
       </group>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
+	<arg choice="plain"><option>--version</option></arg>
 	<arg choice="plain"><option>-v</option></arg>
-	<arg choice="plain"><option>--version</option></arg>
       </group>
     </cmdsynopsis>
   </refsynopsisdiv>
-
+  
   <refsect1 id="description">
     <title>DESCRIPTION</title>
     <para>
       <command>&COMMANDNAME;</command> is a program to generate the
-      OpenPGP keys used by
+      OpenPGP key used by
       <citerefentry><refentrytitle>password-request</refentrytitle>
-      <manvolnum>8mandos</manvolnum></citerefentry>.  The keys are
+      <manvolnum>8mandos</manvolnum></citerefentry>.  The key is
       normally written to /etc/mandos for later installation into the
-      initrd image, but this, like most things, can be changed with
-      command line options.
+      initrd image, but this, and most other things, can be changed
+      with command line options.
     </para>
     <para>
-      It can also be used to generate ready-made sections for
+      This program can also be used with the
+      <option>--password</option> option to generate a ready-made
+      section for <filename>clients.conf</filename> (see
       <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
-      <manvolnum>5</manvolnum></citerefentry> using the
-      <option>--password</option> option.
+      <manvolnum>5</manvolnum></citerefentry>).
     </para>
   </refsect1>
   
   <refsect1 id="purpose">
     <title>PURPOSE</title>
-
     <para>
       The purpose of this is to enable <emphasis>remote and unattended
       rebooting</emphasis> of client host computer with an
       <emphasis>encrypted root file system</emphasis>.  See <xref
       linkend="overview"/> for details.
     </para>
-
   </refsect1>
   
   <refsect1 id="options">
     <title>OPTIONS</title>
-
+    
     <variablelist>
       <varlistentry>
-	<term><literal>-h</literal>, <literal>--help</literal></term>
+	<term><option>--help</option></term>
+	<term><option>-h</option></term>
 	<listitem>
 	  <para>
 	    Show a help message and exit
@@ -222,8 +199,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-d</literal>, <literal>--dir
-	<replaceable>directory</replaceable></literal></term>
+	<term><option>--dir
+	<replaceable>DIRECTORY</replaceable></option></term>
+	<term><option>-d
+	<replaceable>DIRECTORY</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Target directory for key files.  Default is
@@ -233,8 +212,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-t</literal>, <literal>--type
-	<replaceable>type</replaceable></literal></term>
+	<term><option>--type
+	<replaceable>TYPE</replaceable></option></term>
+	<term><option>-t
+	<replaceable>TYPE</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Key type.  Default is <quote>DSA</quote>.
@@ -243,8 +224,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-l</literal>, <literal>--length
-	<replaceable>bits</replaceable></literal></term>
+	<term><option>--length
+	<replaceable>BITS</replaceable></option></term>
+	<term><option>-l
+	<replaceable>BITS</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Key length in bits.  Default is 2048.
@@ -253,8 +236,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-s</literal>, <literal>--subtype
-	<replaceable>type</replaceable></literal></term>
+	<term><option>--subtype
+	<replaceable>KEYTYPE</replaceable></option></term>
+	<term><option>-s
+	<replaceable>KEYTYPE</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Subkey type.  Default is <quote>ELG-E</quote> (Elgamal
@@ -264,8 +249,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-L</literal>, <literal>--sublength
-	<replaceable>bits</replaceable></literal></term>
+	<term><option>--sublength
+	<replaceable>BITS</replaceable></option></term>
+	<term><option>-L
+	<replaceable>BITS</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Subkey length in bits.  Default is 2048.
@@ -274,8 +261,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-e</literal>, <literal>--email</literal>
-	<replaceable>address</replaceable></term>
+	<term><option>--email
+	<replaceable>ADDRESS</replaceable></option></term>
+	<term><option>-e
+	<replaceable>ADDRESS</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Email address of key.  Default is empty.
@@ -284,8 +273,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-c</literal>, <literal>--comment</literal>
-	<replaceable>comment</replaceable></term>
+	<term><option>--comment
+	<replaceable>TEXT</replaceable></option></term>
+	<term><option>-c
+	<replaceable>TEXT</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Comment field for key.  The default value is
@@ -295,8 +286,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-x</literal>, <literal>--expire</literal>
-	<replaceable>time</replaceable></term>
+	<term><option>--expire
+	<replaceable>TIME</replaceable></option></term>
+	<term><option>-x
+	<replaceable>TIME</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Key expire time.  Default is no expiration.  See
@@ -307,16 +300,17 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-f</literal>, <literal>--force</literal></term>
+	<term><option>--force</option></term>
+	<term><option>-f</option></term>
 	<listitem>
 	  <para>
-	    Force overwriting old keys.
+	    Force overwriting old key.
 	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>
-	<term><literal>-p</literal>, <literal>--password</literal
-	></term>
+	<term><option>--password</option></term>
+	<term><option>-p</option></term>
 	<listitem>
 	  <para>
 	    Prompt for a password and encrypt it with the key already
@@ -328,7 +322,7 @@
 	    >8</manvolnum></citerefentry>.  The host name or the name
 	    specified with the <option>--name</option> option is used
 	    for the section header.  All other options are ignored,
-	    and no keys are created.
+	    and no key is created.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -340,15 +334,17 @@
     <xi:include href="overview.xml"/>
     <para>
       This program is a small utility to generate new OpenPGP keys for
-      new Mandos clients.
+      new Mandos clients, and to generate sections for inclusion in
+      <filename>clients.conf</filename> on the server.
     </para>
   </refsect1>
 
   <refsect1 id="exit_status">
     <title>EXIT STATUS</title>
     <para>
-      The exit status will be 0 if new keys were successfully created,
-      otherwise not.
+      The exit status will be 0 if a new key (or password, if the
+      <option>--password</option> option was used) was successfully
+      created, otherwise not.
     </para>
   </refsect1>
   
@@ -425,7 +421,7 @@
     </informalexample>
     <informalexample>
       <para>
-	Create keys in another directory and of another type.  Force
+	Create key in another directory and of another type.  Force
 	overwriting old key files:
       </para>
       <para>
@@ -435,6 +431,29 @@
 
       </para>
     </informalexample>
+    <informalexample>
+      <para>
+	Prompt for a password, encrypt it with the key in
+	<filename>/etc/mandos</filename> and output a section suitable
+	for <filename>clients.conf</filename>.
+      </para>
+      <para>
+	<userinput>&COMMANDNAME; --password</userinput>
+      </para>
+    </informalexample>
+    <informalexample>
+      <para>
+	Prompt for a password, encrypt it with the key in the
+	<filename>client-key</filename> directory and output a section
+	suitable for <filename>clients.conf</filename>.
+      </para>
+      <para>
+
+<!-- do not wrap this line -->
+<userinput>&COMMANDNAME; --password --dir client-key</userinput>
+
+      </para>
+    </informalexample>
   </refsect1>
 
   <refsect1 id="security">
@@ -442,12 +461,12 @@
     <para>
       The <option>--type</option>, <option>--length</option>,
       <option>--subtype</option>, and <option>--sublength</option>
-      options can be used to create keys of insufficient security.  If
-      in doubt, leave them to the default values.
+      options can be used to create keys of low security.  If in
+      doubt, leave them to the default values.
     </para>
     <para>
-      The key expire time is not guaranteed to be honored by
-      <citerefentry><refentrytitle>mandos</refentrytitle>
+      The key expire time is <emphasis>not</emphasis> guaranteed to be
+      honored by <citerefentry><refentrytitle>mandos</refentrytitle>
       <manvolnum>8</manvolnum></citerefentry>.
     </para>
   </refsect1>
@@ -457,6 +476,8 @@
     <para>
       <citerefentry><refentrytitle>gpg</refentrytitle>
       <manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>mandos-clients.conf</refentrytitle>
+      <manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>mandos</refentrytitle>
       <manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>password-request</refentrytitle>

=== modified file 'mandos.conf.xml'
--- mandos.conf.xml	2008-08-30 18:45:41 +0000
+++ mandos.conf.xml	2008-08-31 15:06:39 +0000
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY CONFNAME "mandos.conf">
 <!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
-<!ENTITY TIMESTAMP "2008-08-30">
+<!ENTITY TIMESTAMP "2008-08-31">
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -35,29 +35,7 @@
       <holder>Teddy Hogeborn</holder>
       <holder>Björn Påhlsson</holder>
     </copyright>
-    <legalnotice>
-      <para>
-	This manual page 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 3 of the License, or (at your option) any
-	later version.
-      </para>
-
-      <para>
-	This manual page 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.
-      </para>
-
-      <para>
-	You should have received a copy of the GNU General Public
-	License along with this program; If not, see
-	<ulink url="http://www.gnu.org/licenses/"/>.
-      </para>
-    </legalnotice>
+    <xi:include href="legalnotice.xml"/>
   </refentryinfo>
 
   <refmeta>

=== modified file 'mandos.xml'
--- mandos.xml	2008-08-30 19:05:15 +0000
+++ mandos.xml	2008-08-31 15:06:39 +0000
@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "mandos">
-<!ENTITY TIMESTAMP "2008-08-30">
+<!ENTITY TIMESTAMP "2008-08-31">
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -34,29 +34,7 @@
       <holder>Teddy Hogeborn</holder>
       <holder>Björn Påhlsson</holder>
     </copyright>
-    <legalnotice>
-      <para>
-	This manual page 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 3 of the License, or (at your option) any
-	later version.
-      </para>
-
-      <para>
-	This manual page 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.
-      </para>
-
-      <para>
-	You should have received a copy of the GNU General Public
-	License along with this program; If not, see
-	<ulink url="http://www.gnu.org/licenses/"/>.
-      </para>
-    </legalnotice>
+    <xi:include href="legalnotice.xml"/>
   </refentryinfo>
 
   <refmeta>
@@ -109,8 +87,8 @@
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
+	<arg choice="plain"><option>--help</option></arg>
 	<arg choice="plain"><option>-h</option></arg>
-	<arg choice="plain"><option>--help</option></arg>
       </group>
     </cmdsynopsis>
     <cmdsynopsis>
@@ -149,51 +127,55 @@
       <emphasis>encrypted root file system</emphasis>.  See <xref
       linkend="overview"/> for details.
     </para>
-
+    
   </refsect1>
   
   <refsect1 id="options">
     <title>OPTIONS</title>
-
+    
     <variablelist>
       <varlistentry>
+	<term><option>--help</option></term>
 	<term><option>-h</option></term>
-	<term><option>--help</option></term>
 	<listitem>
 	  <para>
 	    Show a help message and exit
 	  </para>
 	</listitem>
       </varlistentry>
-
+      
       <varlistentry>
+	<term><option>--interface</option>
+	<replaceable>NAME</replaceable></term>
 	<term><option>-i</option>
 	<replaceable>NAME</replaceable></term>
-	<term><option>--interface</option>
-	<replaceable>NAME</replaceable></term>
 	<listitem>
 	  <xi:include href="mandos-options.xml" xpointer="interface"/>
 	</listitem>
       </varlistentry>
-
+      
       <varlistentry>
-	<term><literal>-a</literal>, <literal>--address <replaceable>
-	ADDRESS</replaceable></literal></term>
+	<term><option>--address
+	<replaceable>ADDRESS</replaceable></option></term>
+	<term><option>-a
+	<replaceable>ADDRESS</replaceable></option></term>
 	<listitem>
 	  <xi:include href="mandos-options.xml" xpointer="address"/>
 	</listitem>
       </varlistentry>
-
+      
       <varlistentry>
-	<term><literal>-p</literal>, <literal>--port <replaceable>
-	PORT</replaceable></literal></term>
+	<term><option>--port
+	<replaceable>PORT</replaceable></option></term>
+	<term><option>-p
+	<replaceable>PORT</replaceable></option></term>
 	<listitem>
 	  <xi:include href="mandos-options.xml" xpointer="port"/>
 	</listitem>
       </varlistentry>
-
+      
       <varlistentry>
-	<term><literal>--check</literal></term>
+	<term><option>--check</option></term>
 	<listitem>
 	  <para>
 	    Run the server’s self-tests.  This includes any unit
@@ -201,25 +183,25 @@
 	  </para>
 	</listitem>
       </varlistentry>
-
+      
       <varlistentry>
-	<term><literal>--debug</literal></term>
+	<term><option>--debug</option></term>
 	<listitem>
 	  <xi:include href="mandos-options.xml" xpointer="debug"/>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><literal>--priority <replaceable>
-	PRIORITY</replaceable></literal></term>
+	<term><option>--priority <replaceable>
+	PRIORITY</replaceable></option></term>
 	<listitem>
 	  <xi:include href="mandos-options.xml" xpointer="priority"/>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><literal>--servicename <replaceable>NAME</replaceable>
-	</literal></term>
+	<term><option>--servicename
+	<replaceable>NAME</replaceable></option></term>
 	<listitem>
 	  <xi:include href="mandos-options.xml"
 		      xpointer="servicename"/>
@@ -227,8 +209,8 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>--configdir <replaceable>DIR</replaceable>
-	</literal></term>
+	<term><option>--configdir
+	<replaceable>DIRECTORY</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Directory to search for configuration files.  Default is
@@ -242,7 +224,7 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>--version</literal></term>
+	<term><option>--version</option></term>
 	<listitem>
 	  <para>
 	    Prints the program version and exit.

=== modified file 'overview.xml'
--- overview.xml	2008-08-23 07:17:28 +0000
+++ overview.xml	2008-08-31 15:06:39 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <para>
   This is part of the Mandos system for allowing computers to have
-  encrypted root file systems and also be capable of remote and
-  unattended reboots.  The computers run a small client program in the
-  initial RAM disk environment which will communicate with a server
-  over a network.  The clients are identified by the server using a
-  OpenPGP key; each client has one unique to it.  The server sends the
-  clients an encrypted password.  The encrypted password is decrypted
-  by the clients using the same OpenPGP key, and the password is then
-  used to unlock the root file system, whereupon the computers can
-  continue booting normally.
+  encrypted root file systems and at the same time be capable of
+  remote and/or unattended reboots.  The computers run a small client
+  program in the initial RAM disk environment which will communicate
+  with a server over a network.  The clients are identified by the
+  server using a OpenPGP key; each client has one unique to it.  The
+  server sends the clients an encrypted password.  The encrypted
+  password is decrypted by the clients using the same OpenPGP key, and
+  the password is then used to unlock the root file system, whereupon
+  the computers can continue booting normally.
 </para>

=== modified file 'plugin-runner.xml'
--- plugin-runner.xml	2008-08-30 19:49:24 +0000
+++ plugin-runner.xml	2008-08-31 15:06:39 +0000
@@ -1,17 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl"
-	href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "plugin-runner">
-<!ENTITY TIMESTAMP "2008-08-30">
+<!ENTITY TIMESTAMP "2008-08-31">
 ]>
 
-<refentry>
+<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
     <title>Mandos Manual</title>
-    <!-- NWalsh's docbook scripts use this to generate the footer: -->
+    <!-- Nwalsh’s docbook scripts use this to generate the footer: -->
     <productname>Mandos</productname>
     <productnumber>&VERSION;</productnumber>
     <date>&TIMESTAMP;</date>
@@ -33,31 +31,10 @@
     </authorgroup>
     <copyright>
       <year>2008</year>
-      <holder>Teddy Hogeborn &amp; Björn Påhlsson</holder>
+      <holder>Teddy Hogeborn</holder>
+      <holder>Björn Påhlsson</holder>
     </copyright>
-    <legalnotice>
-      <para>
-	This manual page 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 3 of the License, or (at your option) any
-	later version.
-      </para>
-
-      <para>
-	This manual page 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.
-      </para>
-
-      <para>
-	You should have received a copy of the GNU General Public
-	License along with this program; If not, see
-	<ulink url="http://www.gnu.org/licenses/"/>.
-      </para>
-    </legalnotice>
+    <xi:include href="legalnotice.xml"/>
   </refentryinfo>
 
   <refmeta>
@@ -132,19 +109,19 @@
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
-	<arg choice='plain'><option>--help</option></arg>
-	<arg choice='plain'><option>-?</option></arg>
+	<arg choice="plain"><option>--help</option></arg>
+	<arg choice="plain"><option>-?</option></arg>
       </group>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
-      <arg choice='plain'><option>--usage</option></arg>
+      <arg choice="plain"><option>--usage</option></arg>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
-	<arg choice='plain'><option>--version</option></arg>
-	<arg choice='plain'><option>-V</option></arg>
+	<arg choice="plain"><option>--version</option></arg>
+	<arg choice="plain"><option>-V</option></arg>
       </group>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -172,8 +149,10 @@
     <title>OPTIONS</title>
     <variablelist>
       <varlistentry>
-	<term><literal>-g</literal>,<literal>--global-options
-	<replaceable>OPTIONS</replaceable></literal></term>
+	<term><option>--global-options
+	<replaceable>OPTIONS</replaceable></option></term>
+	<term><option>-g
+	<replaceable>OPTIONS</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Global options given to all plugins as additional start
@@ -184,9 +163,12 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-o</literal>,<literal> --options-for
-	<replaceable>PLUGIN</replaceable>:<replaceable>OPTION</replaceable>
-	</literal></term>
+	<term><option>--options-for
+	<replaceable>PLUGIN</replaceable><literal>:</literal
+	><replaceable>OPTION</replaceable></option></term>
+	<term><option>-o
+	<replaceable>PLUGIN</replaceable><literal>:</literal
+	><replaceable>OPTION</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Plugin specific options given to the plugin as additional
@@ -197,9 +179,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-d</literal>,<literal> --disable
-	<replaceable>PLUGIN</replaceable>
-	</literal></term>
+	<term><option> --disable
+	<replaceable>PLUGIN</replaceable></option></term>
+	<term><option>-d
+	<replaceable>PLUGIN</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Disable a specific plugin
@@ -208,8 +191,8 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>--groupid <replaceable>ID</replaceable>
-	</literal></term>
+	<term><option>--groupid
+	<replaceable>ID</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Group ID the plugins will run as
@@ -218,8 +201,8 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>--userid <replaceable>ID</replaceable>
-	</literal></term>
+	<term><option>--userid
+	<replaceable>ID</replaceable></option></term>
 	<listitem>
 	  <para>
 	    User ID the plugins will run as
@@ -228,8 +211,8 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>--plugin-dir <replaceable>DIRECTORY</replaceable>
-	</literal></term>
+	<term><option>--plugin-dir
+	<replaceable>DIRECTORY</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Specify a different plugin directory
@@ -238,7 +221,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><literal>--debug</literal></term>
+	<term><option>--debug</option></term>
 	<listitem>
 	  <para>
 	    Debug mode
@@ -247,7 +230,8 @@
       </varlistentry>
       
       <varlistentry>
-	<term><literal>-?</literal>, <literal>--help</literal></term>
+	<term><option>--help</option></term>
+	<term><option>-?</option></term>
 	<listitem>
 	  <para>
 	    Gives a help message
@@ -256,7 +240,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><literal>--usage</literal></term>
+	<term><option>--usage</option></term>
 	<listitem>
 	  <para>
 	    Gives a short usage message
@@ -265,7 +249,8 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-V</literal>, <literal>--version</literal></term>
+	<term><option>--version</option></term>
+	<term><option>-V</option></term>
 	<listitem>
 	  <para>
 	    Prints the program version

=== modified file 'plugins.d/password-prompt.xml'
--- plugins.d/password-prompt.xml	2008-08-30 17:16:33 +0000
+++ plugins.d/password-prompt.xml	2008-08-31 15:06:39 +0000
@@ -3,10 +3,10 @@
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "password-prompt">
-<!ENTITY TIMESTAMP "2008-08-30">
+<!ENTITY TIMESTAMP "2008-08-31">
 ]>
 
-<refentry>
+<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
     <title>Mandos Manual</title>
     <!-- NWalsh’s docbook scripts use this to generate the footer: -->
@@ -34,29 +34,7 @@
       <holder>Teddy Hogeborn</holder>
       <holder>Björn Påhlsson</holder>
     </copyright>
-    <legalnotice>
-      <para>
-	This manual page 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 3 of the License, or (at your option) any
-	later version.
-      </para>
-      
-      <para>
-	This manual page 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.
-      </para>
-      
-      <para>
-	You should have received a copy of the GNU General Public
-	License along with this program; If not, see
-	<ulink url="http://www.gnu.org/licenses/"/>.
-      </para>
-    </legalnotice>
+    <xi:include href="../legalnotice.xml"/>
   </refentryinfo>
   
   <refmeta>
@@ -73,18 +51,19 @@
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="opt">
-	<arg choice="plain"><option>-p <replaceable
+	<arg choice="plain"><option>--prefix <replaceable
 	>PREFIX</replaceable></option></arg>
-	<arg choice="plain"><option>--prefix </option><replaceable
+	<arg choice="plain"><option>-p </option><replaceable
 	>PREFIX</replaceable></arg>
       </group>
+      <sbr/>
       <arg choice="opt"><option>--debug</option></arg>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
+	<arg choice="plain"><option>--help</option></arg>
 	<arg choice="plain"><option>-?</option></arg>
-	<arg choice="plain"><option>--help</option></arg>
       </group>
     </cmdsynopsis>
     <cmdsynopsis>
@@ -94,8 +73,8 @@
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
+	<arg choice="plain"><option>--version</option></arg>
 	<arg choice="plain"><option>-V</option></arg>
-	<arg choice="plain"><option>--version</option></arg>
       </group>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -133,10 +112,10 @@
     
     <variablelist>
       <varlistentry>
-	<term><option>-p</option> <replaceable>PREFIX</replaceable
-	></term>
-	<term><option>--prefix=</option><replaceable
-	>PREFIX</replaceable></term>
+	<term><option>--prefix=<replaceable
+	>PREFIX</replaceable></option></term>
+	<term><option>-p
+	<replaceable>PREFIX</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Prefix string shown before the password prompt.
@@ -156,8 +135,8 @@
       </varlistentry>
       
       <varlistentry>
+	<term><option>--help</option></term>
 	<term><option>-?</option></term>
-	<term><option>--help</option></term>
 	<listitem>
 	  <para>
 	    Gives a help message about options and their meanings.
@@ -175,8 +154,8 @@
       </varlistentry>
       
       <varlistentry>
+	<term><option>--version</option></term>
 	<term><option>-V</option></term>
-	<term><option>--version</option></term>
 	<listitem>
 	  <para>
 	    Prints the program version.

=== modified file 'plugins.d/password-request.xml'
--- plugins.d/password-request.xml	2008-08-30 17:16:33 +0000
+++ plugins.d/password-request.xml	2008-08-31 15:06:39 +0000
@@ -1,17 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?xml-stylesheet type="text/xsl"
-	href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "password-request">
-<!ENTITY TIMESTAMP "2008-08-30">
+<!ENTITY TIMESTAMP "2008-08-31">
 ]>
 
-<refentry>
+<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
   <refentryinfo>
     <title>Mandos Manual</title>
-    <!-- NWalsh's docbook scripts use this to generate the footer: -->
+    <!-- Nwalsh’s docbook scripts use this to generate the footer: -->
     <productname>Mandos</productname>
     <productnumber>&VERSION;</productnumber>
     <date>&TIMESTAMP;</date>
@@ -33,31 +31,10 @@
     </authorgroup>
     <copyright>
       <year>2008</year>
-      <holder>Teddy Hogeborn &amp; Björn Påhlsson</holder>
+      <holder>Teddy Hogeborn</holder>
+      <holder>Björn Påhlsson</holder>
     </copyright>
-    <legalnotice>
-      <para>
-	This manual page 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 3 of the License, or (at your option) any
-	later version.
-      </para>
-
-      <para>
-	This manual page 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.
-      </para>
-
-      <para>
-	You should have received a copy of the GNU General Public
-	License along with this program; If not, see
-	<ulink url="http://www.gnu.org/licenses/"/>.
-      </para>
-    </legalnotice>
+    <xi:include href="../legalnotice.xml"/>
   </refentryinfo>
 
   <refmeta>
@@ -86,9 +63,9 @@
       <sbr/>
       <group>
 	<arg choice="plain"><option>--keydir
-	<replaceable>KEYDIR</replaceable></option></arg>
+	<replaceable>DIRECTORY</replaceable></option></arg>
 	<arg choice="plain"><option>-d
-	<replaceable>KEYDIR</replaceable></option></arg>
+	<replaceable>DIRECTORY</replaceable></option></arg>
       </group>
       <sbr/>
       <group>
@@ -127,19 +104,19 @@
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
-	<arg choice='plain'><option>-?</option></arg>
-	<arg choice='plain'><option>--help</option></arg>
+	<arg choice="plain"><option>--help</option></arg>
+	<arg choice="plain"><option>-?</option></arg>
       </group>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
-      <arg choice='plain'><option>--usage</option></arg>
+      <arg choice="plain"><option>--usage</option></arg>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
-	<arg choice='plain'><option>-V</option></arg>
-	<arg choice='plain'><option>--version</option></arg>
+	<arg choice="plain"><option>--version</option></arg>
+	<arg choice="plain"><option>-V</option></arg>
       </group>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -164,8 +141,12 @@
 
     <variablelist>
       <varlistentry>
-	<term><literal>-c</literal>, <literal>--connect=<replaceable>
-	IP</replaceable></literal></term>
+	<term><option>--connect=<replaceable
+	>IPADDR</replaceable><literal>:</literal><replaceable
+	>PORT</replaceable></option></term>
+	<term><option>-c
+	<replaceable>IPADDR</replaceable><literal>:</literal
+	><replaceable>PORT</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Connect directly to a specified mandos server
@@ -174,8 +155,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-d</literal>, <literal>--keydir=<replaceable>
-	KEYDIR</replaceable></literal></term>
+	<term><option>--keydir=<replaceable
+	>DIRECTORY</replaceable></option></term>
+	<term><option>-d
+	<replaceable>DIRECTORY</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Directory where the openpgp keyring is
@@ -184,18 +167,22 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-i</literal>, <literal>--interface=
-	<replaceable>INTERFACE</replaceable></literal></term>
+	<term><option>--interface=
+	<replaceable>NAME</replaceable></option></term>
+	<term><option>-i
+	<replaceable>NAME</replaceable></option></term>
 	<listitem>
 	  <para>
-	    Interface that Avahi will conntect through
+	    Interface that Avahi will connect through
 	  </para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-p</literal>, <literal>--pubkey=<replaceable>
-	PUBKEY</replaceable></literal></term>
+	<term><option>--pubkey=<replaceable
+	>FILE</replaceable></option></term>
+	<term><option>-p
+	<replaceable>FILE</replaceable></option></term>
 	<listitem>
 	  <para>
 	    Public openpgp key for gnutls authentication
@@ -204,37 +191,39 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-s</literal>, <literal>--seckey=<replaceable>
-	SECKEY</replaceable></literal></term>
+	<term><option>--seckey=<replaceable
+	>FILE</replaceable></option></term>
+	<term><option>-s
+	<replaceable>FILE</replaceable></option></term>
 	<listitem>
 	  <para>
-	    Secret openpgp key for gnutls authentication
+	    Secret OpenPGP key for GnuTLS authentication
 	  </para>
 	</listitem>
       </varlistentry>
       
       <varlistentry>
-	<term><literal>--priority=<replaceable>PRIORITY</replaceable>
-	</literal></term>
+	<term><option>--priority=<replaceable
+	>STRING</replaceable></option></term>
 	<listitem>
 	  <para>
-	    GNUTLS priority
+	    GnuTLS priority
 	  </para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><literal>--dh-bits=<replaceable>BITS</replaceable>
-	</literal></term>
+	<term><option>--dh-bits=<replaceable
+	>BITS</replaceable></option></term>
 	<listitem>
 	  <para>
-	    dh-bits to use in gnutls communication
+	    DH bits to use in gnutls communication
 	  </para>
 	</listitem>
       </varlistentry>
       
       <varlistentry>
-	<term><literal>--debug</literal></term>
+	<term><option>--debug</option></term>
 	<listitem>
 	  <para>
 	    Debug mode
@@ -243,7 +232,8 @@
       </varlistentry>
       
       <varlistentry>
-	<term><literal>-?</literal>, <literal>--help</literal></term>
+	<term><option>--help</option></term>
+	<term><option>-?</option></term>
 	<listitem>
 	  <para>
 	    Gives a help message
@@ -252,7 +242,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><literal>--usage</literal></term>
+	<term><option>--usage</option></term>
 	<listitem>
 	  <para>
 	    Gives a short usage message
@@ -261,7 +251,8 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-V</literal>, <literal>--version</literal></term>
+	<term><option>--version</option></term>
+	<term><option>-V</option></term>
 	<listitem>
 	  <para>
 	    Prints the program version