=== 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'
--- mandos	2008-08-10 00:04:11 +0000
+++ mandos	2008-08-10 02:01:04 +0000
@@ -654,7 +654,7 @@
     global main_loop_started
     main_loop_started = False
     
-    parser = OptionParser(version = "Mandos server %s" % version)
+    parser = OptionParser(version = "%%prog %s" % version)
     parser.add_option("-i", "--interface", type="string",
                       metavar="IF", help="Bind to interface IF")
     parser.add_option("-a", "--address", type="string",

=== modified file 'mandos-client.c'
--- mandos-client.c	2008-08-09 15:36:06 +0000
+++ mandos-client.c	2008-08-10 00:21:08 +0000
@@ -66,6 +66,9 @@
 
 #define BUFFER_SIZE 256
 
+const char *argp_program_version = "mandos-client 1.0";
+const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
+
 struct process;
 
 typedef struct process{
@@ -144,9 +147,6 @@
   return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
 }
 
-const char *argp_program_version = "plugbasedclient 0.9";
-const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
-
 process *process_list = NULL;
 
 /* Mark a process as completed when it exits, and save its exit

=== modified file 'mandos-client.xml'
--- mandos-client.xml	2008-08-10 00:07:24 +0000
+++ mandos-client.xml	2008-08-10 01:10:04 +0000
@@ -77,7 +77,7 @@
       <arg choice='opt'>--options-for<arg choice='plain'>PLUGIN:OPTIONS</arg></arg>
       <arg choice='opt'>--disable<arg choice='plain'>PLUGIN</arg></arg>
       <arg choice='opt'>--groupid<arg choice='plain'>ID</arg></arg>
-      <arg choice='opt'>--userpid<arg choice='plain'>ID</arg></arg>
+      <arg choice='opt'>--userid<arg choice='plain'>ID</arg></arg>
       <arg choice='opt'>--plugin-dir<arg choice='plain'>DIRECTORY</arg></arg>
       <arg choice='opt'>--debug</arg>
     </cmdsynopsis>
@@ -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

=== modified file 'mandos.xml'
--- mandos.xml	2008-08-10 00:07:24 +0000
+++ mandos.xml	2008-08-10 00:18:25 +0000
@@ -87,11 +87,11 @@
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
+      <arg choice='plain'>--version</arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>&COMMANDNAME;</command>
       <arg choice='plain'>--check</arg>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>&COMMANDNAME;</command>
-      <arg choice='plain'>--version</arg>
     </cmdsynopsis>    
   </refsynopsisdiv>
 
@@ -194,6 +194,15 @@
 	  </para>
 	</listitem>
       </varlistentry>
+
+      <varlistentry>
+	<term><literal>--version</literal></term>
+	<listitem>
+	  <para>
+	    Prints the program version
+	  </para>
+	</listitem>
+      </varlistentry>      
       
     </variablelist>
   </refsect1>

=== modified file 'plugins.d/password-prompt.c'
--- plugins.d/password-prompt.c	2008-08-09 15:36:06 +0000
+++ plugins.d/password-prompt.c	2008-08-10 00:21:08 +0000
@@ -52,7 +52,7 @@
 
 volatile bool quit_now = false;
 bool debug = false;
-const char *argp_program_version = "passprompt 0.9";
+const char *argp_program_version = "password-prompt 1.0";
 const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
 
 static void termination_handler(__attribute__((unused))int signum){

=== modified file 'plugins.d/password-request.c'
--- plugins.d/password-request.c	2008-08-09 15:36:06 +0000
+++ plugins.d/password-request.c	2008-08-10 00:21:08 +0000
@@ -100,7 +100,7 @@
 bool debug = false;
 static const char *keydir = "/conf/conf.d/mandos";
 static const char mandos_protocol_version[] = "1";
-const char *argp_program_version = "mandosclient 0.9";
+const char *argp_program_version = "password-request 1.0";
 const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
 
 /* Used for passing in values through the Avahi callback functions */