=== modified file 'TODO'
--- TODO	2008-08-31 10:44:32 +0000
+++ TODO	2008-08-31 12:23:33 +0000
@@ -109,7 +109,7 @@
 **** DONE mandos.xml
 **** DONE plugin-runner.xml
 **** DONE plugins.d/password-prompt.xml
-**** TODO plugins.d/password-request.xml
+**** DONE plugins.d/password-request.xml
 ** Use xinclude for common sections
    Like copyright, authors, etc.
 

=== modified file 'plugins.d/password-request.xml'
--- plugins.d/password-request.xml	2008-08-31 07:32:05 +0000
+++ plugins.d/password-request.xml	2008-08-31 12:23:33 +0000
@@ -86,9 +86,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>
@@ -164,8 +164,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 +178,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 +190,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 +214,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 +255,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 +265,7 @@
       </varlistentry>
       
       <varlistentry>
-	<term><literal>--usage</literal></term>
+	<term><option>--usage</option></term>
 	<listitem>
 	  <para>
 	    Gives a short usage message
@@ -261,7 +274,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