Split foo and no-foo parts in documentation.

Rename --export to --export-old

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

diff --git a/caff/caff b/caff/caff
index b946a9ab41267a81fc6382f81a368ddb393984f7..f18ec8380f8a7b9697c9a129eb8833b5a1ca8a66 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -56,14 +56,22 @@ sigs and sigs done by you.
 
 =over
 
-=item B<-e>, B<--export>, B<-E>, B<--no-export>
+=item B<-e>, B<--export-old>
 
-Export/do not export old signatures. Default is to ask the user for each old
+Export old signatures. Default is to ask the user for each old signature.
+
+=item B<-E>, B<--no-export-old>
+
+Do not export old signatures. Default is to ask the user for each old
 signature.
 
-=item B<-m>, B<--mail>, B<-M>, B<--no-mail>
+=item B<-m>, B<--mail>
+
+Send mail after signing. Default is to ask the user for each uid.
+
+=item B<-M>, B<--no-mail>
 
-Send/do not send mail after signing. Default is to ask the user for each uid.
+Do not send mail after signing. Default is to ask the user for each uid.
 
 =item B<-R>, B<--no-download>
 
@@ -669,10 +677,10 @@ if (!GetOptions (
        '-V'              =>  \$params->{'version'},
        '-u=s'            =>  \$params->{'local-user'},
        '--local-user=s'  =>  \$params->{'local-user'},
-       '-e'              =>  \$params->{'export'},
-       '--export'        =>  \$params->{'export'},
-       '-E'              =>  \$params->{'no-export'},
-       '--no-export'     =>  \$params->{'no-export'},
+       '-e'              =>  \$params->{'export-old'},
+       '--export-old'    =>  \$params->{'export-old'},
+       '-E'              =>  \$params->{'no-export-old'},
+       '--no-export-old' =>  \$params->{'no-export-old'},
        '-m'              =>  \$params->{'mail'},
        '--mail'          =>  \$params->{'mail'},
        '-M'              =>  \$params->{'no-mail'},
@@ -998,7 +1006,7 @@ for my $keyid (@keyids_ok) {
 
                if ($signed_by_me) {
                        if ($NOW - $signed_by_me > $CONFIG{'export-sig-age'} ) {
-                               my $write = ask("Signature on $this_uid_text is old.  Export?", 0, $params->{export}, $params->{'no-export'});
+                               my $write = ask("Signature on $this_uid_text is old.  Export?", 0, $params->{'export-old'}, $params->{'no-export-old'});
                                next unless $write;
                        };
                        my $keydir = "$KEYSBASE/$DATE_STRING";