=== modified file 'Makefile'
--- Makefile	2008-08-24 06:17:02 +0000
+++ Makefile	2008-08-25 06:44:13 +0000
@@ -33,7 +33,7 @@
 LDFLAGS=$(COVERAGE)
 
 # Commands to format a DocBook refentry document into a manual page
-DOCBOOKTOMAN=cd $(dir $^); xsltproc --nonet --xinclude \
+DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 	--param man.charmap.use.subset		0 \
 	--param make.year.ranges		1 \
 	--param make.single.year.ranges		1 \
@@ -87,19 +87,39 @@
 distclean: clean
 mostlyclean: clean
 maintainer-clean: clean
-	-rm --force --recursive keydir
+	-rm --force --recursive keydir confdir
 
 check:
 	./mandos --check
 
-run-client: all
-	-mkdir keydir
-	-./mandos-keygen --dir keydir
+# Run the server with a local key
+run-client: all keydir/seckey.txt keydir/pubkey.txt \
+	keydir/secring.gpg keydir/pubring.gpg
 	./plugin-runner --plugin-dir=plugins.d \
 		--options-for=password-request:--keydir=keydir
 
-run-server:
-	./mandos --debug --configdir=.
+# Used by run-client
+keydir/secring.gpg: keydir/seckey.txt
+	gpg --homedir $(dir $<) --import $^
+keydir/pubring.gpg: keydir/pubkey.txt
+	gpg --homedir $(dir $<) --import $^
+keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
+	install --directory keydir
+	./mandos-keygen --dir keydir --force
+
+# Run the server with a local config
+run-server: confdir/mandos.conf confdir/clients.conf
+	./mandos --debug --configdir=confdir
+
+# Used by run-server
+confdir/mandos.conf: mandos.conf
+	install --directory confdir
+	install $^ $@
+confdir/clients.conf: clients.conf keydir/seckey.txt
+	install --directory confdir
+	install clients.conf $@
+# Add a client password
+	./mandos-keygen --dir keydir --password >> $@
 
 install: install-server install-client
 

=== modified file 'mandos-keygen'
--- mandos-keygen	2008-08-25 01:16:38 +0000
+++ mandos-keygen	2008-08-25 03:53:42 +0000
@@ -24,7 +24,7 @@
 
 KEYDIR="/etc/mandos"
 KEYTYPE=DSA
-KEYLENGTH=1024
+KEYLENGTH=2048
 SUBKEYTYPE=ELG-E
 SUBKEYLENGTH=2048
 KEYNAME="`hostname --fqdn`"
@@ -56,7 +56,7 @@
   -d DIR, --dir DIR     Target directory for key files
   -t TYPE, --type TYPE  Key type.  Default is DSA.
   -l BITS, --length BITS
-                        Key length in bits.  Default is 1024.
+                        Key length in bits.  Default is 2048.
   -s TYPE, --subtype TYPE
                         Subkey type.  Default is ELG-E.
   -L BITS, --sublength BITS

=== modified file 'mandos-keygen.xml'
--- mandos-keygen.xml	2008-08-24 07:42:14 +0000
+++ mandos-keygen.xml	2008-08-25 03:53:42 +0000
@@ -256,7 +256,7 @@
 	<replaceable>bits</replaceable></literal></term>
 	<listitem>
 	  <para>
-	    Key length in bits.  Default is 1024.
+	    Key length in bits.  Default is 2048.
 	  </para>
 	</listitem>
       </varlistentry>

=== modified file 'mandos-options.xml'
--- mandos-options.xml	2008-08-23 07:17:28 +0000
+++ mandos-options.xml	2008-08-25 06:44:13 +0000
@@ -12,11 +12,11 @@
   
   <para id="interface">
     If this is specified, the server will only announce the service
-    and listen to requests on network interface
-    <replaceable>IF</replaceable>.  Default is to use all available
-    interfaces.  <emphasis>Note:</emphasis> a failure to bind to the
-    specified interface is not considered critical, and the server
-    does not exit, but will instead continue starting normally.
+    and listen to requests on the specified network interface.
+    Default is to use all available interfaces.  <emphasis
+    >Note:</emphasis> a failure to bind to the specified
+    interface is not considered critical, and the server does not
+    exit, but will instead continue normally.
   </para>
   
   <para id="address">
@@ -37,8 +37,8 @@
   
   <para id="debug">
     If the server is run in debug mode, it will run in the foreground
-    and print a lot of debugging information.  The default is
-    <emphasis>not</emphasis> to run in debug mode.
+    and print a lot of debugging information.  The default is to
+    <emphasis>not</emphasis> run in debug mode.
   </para>
   
   <para id="priority">

=== modified file 'mandos.conf.xml'
--- mandos.conf.xml	2008-08-20 03:22:45 +0000
+++ mandos.conf.xml	2008-08-25 06:44:13 +0000
@@ -103,7 +103,7 @@
 	<term><varname>interface</varname></term>
 	<listitem>
 	  <synopsis><literal>interface = </literal><replaceable
-	  >IF</replaceable>
+	  >NAME</replaceable>
 	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="interface"/>
 	</listitem>
@@ -123,7 +123,7 @@
 	<term><varname>port</varname></term>
 	<listitem>
 	  <synopsis><literal>port = </literal><replaceable
-	  >PORT</replaceable>
+	  >NUMBER</replaceable>
 	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="port"/>
 	</listitem>
@@ -146,7 +146,7 @@
 	<term><varname>priority</varname></term>
 	<listitem>
 	  <synopsis><literal>priority = </literal><replaceable
-	  >PRIORITY</replaceable>
+	  >STRING</replaceable>
 	  </synopsis>
 	  <xi:include href="mandos-options.xml" xpointer="priority"/>
 	</listitem>

=== modified file 'mandos.xml'
--- mandos.xml	2008-08-20 00:35:41 +0000
+++ mandos.xml	2008-08-25 06:44:13 +0000
@@ -72,7 +72,7 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
-      <arg>--interface<arg choice="plain">IF</arg></arg>
+      <arg>--interface<arg choice="plain">NAME</arg></arg>
       <arg>--address<arg choice="plain">ADDRESS</arg></arg>
       <arg>--port<arg choice="plain">PORT</arg></arg>
       <arg>--priority<arg choice="plain">PRIORITY</arg></arg>
@@ -82,7 +82,7 @@
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
-      <arg>-i<arg choice="plain">IF</arg></arg>
+      <arg>-i<arg choice="plain">NAME</arg></arg>
       <arg>-a<arg choice="plain">ADDRESS</arg></arg>
       <arg>-p<arg choice="plain">PORT</arg></arg>
       <arg>--priority<arg choice="plain">PRIORITY</arg></arg>
@@ -150,8 +150,8 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-i</literal>, <literal>--interface <replaceable>
-	IF</replaceable></literal></term>
+	<term><literal>-i</literal>, <literal>--interface <replaceable
+	>NAME</replaceable></literal></term>
 	<listitem>
 	  <xi:include href="mandos-options.xml" xpointer="interface"/>
 	</listitem>