=== modified file 'TODO'
--- TODO	2008-08-10 00:04:11 +0000
+++ TODO	2008-08-10 01:10:04 +0000
@@ -7,14 +7,6 @@
 
 * Mandos-client
 ** [#A] Man page: man8/mandos-client.8mandos
-*** SYNOPSIS
-    Needs options listed, not just "[OPTION...]"
-*** DESCRIPTION
-    Move options to new OPTIONS section.
-    State that this command is not meant to be invoked directly, but
-    is meant to be run by cryptsetup by being specified in
-    /etc/crypttab and only run in the initrd environment, not the real
-    system.
 *** EXIT STATUS
     Create this section
 *** USAGE
@@ -45,8 +37,6 @@
 
 * Password-request
 ** [#A] Man page: man8/password-request.8mandos
-*** SYNOPSIS
-    Needs options listed, not just "[OPTION...]"
 *** DESCRIPTION
     Move options to new OPTIONS section.
     State that this command is not meant to be invoked directly, but
@@ -81,8 +71,6 @@
 
 * Password-prompt
 ** [#A] Man page: man8/password-prompt.8mandos
-*** SYNOPSIS
-    Needs options listed, not just "[OPTION...]"
 *** DESCRIPTION
     Move options to new OPTIONS section.
 *** EXIT STATUS
@@ -110,8 +98,6 @@
 
 * Mandos (server)
 ** [#A] Command man page: man8/mandos.8
-*** SYNOPSIS
-    Needs options listed, not just "[OPTION...]"
 *** DESCRIPTION
     Move options to new OPTIONS section
 *** EXIT STATUS

=== modified file 'mandos-client.xml'
--- mandos-client.xml	2008-08-10 00:18:25 +0000
+++ mandos-client.xml	2008-08-10 01:10:04 +0000
@@ -100,11 +100,22 @@
     <para>
       <command>&COMMANDNAME;</command> is a plugin runner that waits
       for any of its plugins to return sucessfull with a password, and
-      passes it to cryptsetup. plugins is defined as any executables
-      in the plugins directory will by default will be
-      /conf/conf.d/mandos/plugins.d.  to stdout.
+      passes it to cryptsetup as stdout message. This command is not
+      meant to be invoked directly, but is instead meant to be run by
+      cryptsetup by being specified in /etc/crypttab as a keyscript
+      and subsequlently started in the initrd environment. See
+      <citerefentry><refentrytitle>crypttab</refentrytitle>
+      <manvolnum>5</manvolnum></citerefentry> for more information on
+      keyscripts.    
     </para>
 
+    <para>
+      plugins is looked for in the plugins directory which by default will be
+      /conf/conf.d/mandos/plugins.d if not changed by option --plugin-dir.
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
     <variablelist>
       <varlistentry>
 	<term><literal>-g</literal>,<literal>--global-options