=== modified file 'mandos-client.c'
--- mandos-client.c	2008-08-09 15:36:06 +0000
+++ mandos-client.c	2008-08-10 00:18:25 +0000
@@ -66,6 +66,9 @@
 
 #define BUFFER_SIZE 256
 
+const char *argp_program_version = "plugbasedclient 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 00:18:25 +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>

=== 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:18:25 +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 = "passprompt 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:18:25 +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 = "mandosclient 1.0";
 const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
 
 /* Used for passing in values through the Avahi callback functions */