* Reorder manpage and insert section headers

* Add myself to authors

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@102 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/caff/caff b/caff/caff
index 59ee3b8dcae3e4813fdb9417e6885a26c8c31712..54bb9cc75ad44aaadc6b1f9d46d0e29eab6b9a7b 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -4,6 +4,7 @@
 # $Id$
 #
 # Copyright (c) 2004, 2005 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2005 Christoph Berg <cb@df7cb.de>
 #
 # All rights reserved.
 #
@@ -91,14 +92,10 @@ Example:
        $CONFIG{email} = q{peter@palfrader.org};
        $CONFIG{keyid} = [ qw{DE7AAF6E94C09C7F 62AF4031C82E0039} ];
 
-=head2 Valid keys
+=head2 Required basic settings
 
 =over
 
-=item B<caffhome> [string]
-
-Base directory for the files caff stores.  Default: B<$HOME/.caff/>.
-
 =item B<owner> [string]
 
 Your name.  B<REQUIRED>.
@@ -113,14 +110,13 @@ A list of your keys.  This is used to determine which signatures to keep
 in the pruning step.  If you select a key using B<-u> it has to be in
 this list.  B<REQUIRED>.
 
-=item B<export-sig-age> [seconds]
+=head2 General settings
 
-Don't export UIDs by default, on which your latest signature is older
-than this age.  Default: B<24*60*60> (i.e. one day).
+=item B<caffhome> [string]
 
-=item B<keyserver> [string]
+Base directory for the files caff stores.  Default: B<$HOME/.caff/>.
 
-Keyserver to download keys from.  Default: B<subkeys.pgp.net>.
+=head2 GnuPG settings
 
 =item B<gpg> [string]
 
@@ -145,15 +141,39 @@ Path to your secret keyring.  Default: B<$HOME/.gnupg/secring.gpg>.
 
 An additional keyid to encrypt messages to. Default: none.
 
+=head2 Keyserver settings
+
+=item B<keyserver> [string]
+
+Keyserver to download keys from.  Default: B<subkeys.pgp.net>.
+
 =item B<no-download> [boolean]
 
 If true, then skip the step of fetching keys from the keyserver.
 Default: B<0>.
 
+=head2 Signing settings
+
 =item B<no-sign> [boolean]
 
 If true, then skip the signing step. Default: B<0>.
 
+=item B<export-sig-age> [seconds]
+
+Don't export UIDs by default, on which your latest signature is older
+than this age.  Default: B<24*60*60> (i.e. one day).
+
+=head2 Mail settings
+
+=item B<mail> [boolean]
+
+Do not prompt for sending mail, just do it. Default: B<0>.
+
+=item B<no-mail> [boolean]
+
+Do not prompt for sending mail. The messages are still written to
+$CONFIG{caffhome}/keys/. Default: B<0>.
+
 =item B<mail-template> [string]
 
 Email template which is used as the body text for the email sent out.
@@ -183,9 +203,15 @@ Default: none.
 
 =back
 
-=head1 AUTHOR
+=head1 AUTHORS
+
+=over
+
+=item Peter Palfrader <peter@palfrader.org>
 
-Peter Palfrader <peter@palfrader.org>
+=item Christoph Berg <cb@df7cb.de>
+
+=back
 
 =head1 WEBSITE
 
@@ -412,7 +438,7 @@ my $KEYEDIT_KEYEDIT_OR_DELSIG_PROMPT = '^\[GNUPG:\] (GET_BOOL keyedit.delsig|GET
 my $KEYEDIT_DELSUBKEY_PROMPT = '^\[GNUPG:\] GET_BOOL keyedit.remove.subkey';
 
 load_config;
-my $USER_AGENT = "caff $VERSION - (c) 2004, 2005 Peter Palfrader";
+my $USER_AGENT = "caff $VERSION - (c) 2004, 2005 Peter Palfrader et al.";
 
 my $KEYSBASE =  $CONFIG{'caffhome'}.'/keys';
 my $GNUPGHOME = $CONFIG{'caffhome'}.'/gnupghome';
@@ -427,7 +453,7 @@ my $DATE_STRING = sprintf("%04d-%02d-%02d", $year+1900, $mon+1, $mday);
 
 sub version($) {
        my ($fd) = @_;
-       print $fd "caff $VERSION - (c) 2004, 2005 Peter Palfrader\n";
+       print $fd "caff $VERSION - (c) 2004, 2005 Peter Palfrader et al.\n";
 };
 
 sub usage($$) {