=== modified file 'plugins.d/password-request.xml'
--- plugins.d/password-request.xml	2008-09-03 17:34:29 +0000
+++ plugins.d/password-request.xml	2008-09-03 20:31:19 +0000
@@ -62,13 +62,6 @@
       </group>
       <sbr/>
       <group>
-	<arg choice="plain"><option>--keydir
-	<replaceable>DIRECTORY</replaceable></option></arg>
-	<arg choice="plain"><option>-d
-	<replaceable>DIRECTORY</replaceable></option></arg>
-      </group>
-      <sbr/>
-      <group>
 	<arg choice="plain"><option>--interface
 	<replaceable>NAME</replaceable></option></arg>
 	<arg choice="plain"><option>-i
@@ -191,22 +184,6 @@
       </varlistentry>
       
       <varlistentry>
-	<term><option>--keydir=<replaceable
-	>DIRECTORY</replaceable></option></term>
-	<term><option>-d
-	<replaceable>DIRECTORY</replaceable></option></term>
-	<listitem>
-	  <para>
-	    Directory to read the OpenPGP key files
-	    <filename>pubkey.txt</filename> and
-	    <filename>seckey.txt</filename> from.  The default is
-	    <filename>/conf/conf.d/mandos</filename> (in the initial
-	    <acronym>RAM</acronym> disk environment).
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
 	<term><option>--interface=
 	<replaceable>NAME</replaceable></option></term>
 	<term><option>-i
@@ -232,10 +209,9 @@
 	<replaceable>FILE</replaceable></option></term>
 	<listitem>
 	  <para>
-	    OpenPGP public key file base name.  This will be combined
-	    with the directory from the <option>--keydir</option>
-	    option to form an absolute file name.  The default name is
-	    <quote><literal>pubkey.txt</literal></quote>.
+	    OpenPGP public key file name.  The default name is
+	    <quote><filename>/conf/conf.d/mandos/pubkey.txt</filename
+	    ></quote>.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -247,10 +223,9 @@
 	<replaceable>FILE</replaceable></option></term>
 	<listitem>
 	  <para>
-	    OpenPGP secret key file base name.  This will be combined
-	    with the directory from the <option>--keydir</option>
-	    option to form an absolute file name.  The default name is
-	    <quote><literal>seckey.txt</literal></quote>.
+	    OpenPGP secret key file name.  The default name is
+	    <quote><filename>/conf/conf.d/mandos/seckey.txt</filename
+	    ></quote>.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -420,25 +395,27 @@
     </informalexample>
     <informalexample>
       <para>
-	Run in debug mode, and use a custom key directory:
+	Run in debug mode, and use a custom key:
       </para>
       <para>
-	<!-- do not wrap this line -->
-	<userinput>&COMMANDNAME; --debug --keydir keydir</userinput>
+
+<!-- do not wrap this line -->
+<userinput>&COMMANDNAME; --debug --pubkey keydir/pubkey.txt --seckey keydir/seckey.txt</userinput>
+
       </para>
     </informalexample>
     <informalexample>
       <para>
-	Run in debug mode, with a custom key directory, and do not use
-	Zeroconf to locate a server; connect directly to the IPv6
-	address <quote><systemitem class="ipaddress"
+	Run in debug mode, with a custom key, and do not use Zeroconf
+	to locate a server; connect directly to the IPv6 address
+	<quote><systemitem class="ipaddress"
 	>2001:db8:f983:bd0b:30de:ae4a:71f2:f672</systemitem></quote>,
 	port 4711, using interface eth2:
       </para>
       <para>
 
 <!-- do not wrap this line -->
-<userinput>&COMMANDNAME; --debug --keydir keydir --connect 2001:db8:f983:bd0b:30de:ae4a:71f2:f672:4711 --interface eth2</userinput>
+<userinput>&COMMANDNAME; --debug --pubkey keydir/pubkey.txt --seckey keydir/seckey.txt --connect 2001:db8:f983:bd0b:30de:ae4a:71f2:f672:4711 --interface eth2</userinput>
 
       </para>
     </informalexample>