=== modified file 'TODO'
--- TODO	2008-09-03 05:04:40 +0000
+++ TODO	2008-09-03 13:59:58 +0000
@@ -9,13 +9,6 @@
 
 * password-request
 ** [#A] Man page: man8/password-request.8mandos
-*** FILES
-    Describe the key files and the key ring files.  Also note that
-    they should normally have been automatically created.
-*** BUGS
-*** EXAMPLE
-    Examples of normal usage, debug usage, debugging by connecting
-    directly, etc.
 *** SECURITY
 *** SEE ALSO
     Update from mandos.xml

=== modified file 'plugins.d/password-request.xml'
--- plugins.d/password-request.xml	2008-09-03 05:12:45 +0000
+++ plugins.d/password-request.xml	2008-09-03 13:59:58 +0000
@@ -217,6 +217,11 @@
 	    Mandos servers to connect to.  The default it
 	    <quote><literal>eth0</literal></quote>.
 	  </para>
+	  <para>
+	    If the <option>--connect</option> option is used, this
+	    specifies the interface to use to connect to the address
+	    given.
+	  </para>
 	</listitem>
       </varlistentry>
       
@@ -361,20 +366,80 @@
   
   <refsect1 id="file">
     <title>FILES</title>
-    <para>
-    </para>
+    <variablelist>
+      <varlistentry>
+	<term><filename>/conf/conf.d/mandos/pubkey.txt</filename
+	></term>
+	<term><filename>/conf/conf.d/mandos/seckey.txt</filename
+	></term>
+	<listitem>
+	  <para>
+	    OpenPGP public and private key files, in <quote>ASCII
+	    Armor</quote> format.  These are the default file names,
+	    they can be changed with the <option>--pubkey</option> and
+	    <option>--seckey</option> options.
+	  </para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
   </refsect1>
   
-  <refsect1 id="bugs">
-    <title>BUGS</title>
-    <para>
-    </para>
-  </refsect1>
+<!--   <refsect1 id="bugs"> -->
+<!--     <title>BUGS</title> -->
+<!--     <para> -->
+<!--     </para> -->
+<!--   </refsect1> -->
 
   <refsect1 id="example">
     <title>EXAMPLE</title>
     <para>
+      Note that normally, command line options will not be given
+      directly, but via options for the Mandos <citerefentry
+      ><refentrytitle>plugin-runner</refentrytitle>
+      <manvolnum>8mandos</manvolnum></citerefentry>.
     </para>
+    <informalexample>
+      <para>
+	Normal invocation needs no options, if the network interface
+	is <quote>eth0</quote>:
+      </para>
+      <para>
+	<userinput>&COMMANDNAME;</userinput>
+      </para>
+    </informalexample>
+    <informalexample>
+      <para>
+	Search for Mandos servers on another interface:
+      </para>
+      <para>
+	<!-- do not wrap this line -->
+	<userinput>&COMMANDNAME; --interface eth1</userinput>
+      </para>
+    </informalexample>
+    <informalexample>
+      <para>
+	Run in debug mode, and use a custom key directory:
+      </para>
+      <para>
+	<!-- do not wrap this line -->
+	<userinput>&COMMANDNAME; --debug --keydir keydir</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"
+	>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>
+
+      </para>
+    </informalexample>
   </refsect1>
 
   <refsect1 id="security">