[Pgp-tools-commit] r109 - trunk/caff

[Peter Palfrader]

Author: weasel
Date: 2005-07-02 21:31:49 +0000 (Sat, 02 Jul 2005)
New Revision: 109

Modified:
   trunk/caff/caff
Log:
Split foo and no-foo parts in documentation.
Rename --export to --export-old

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2005-07-02 19:48:05 UTC (rev 108)
+++ trunk/caff/caff	2005-07-02 21:31:49 UTC (rev 109)
@@ -56,15 +56,23 @@
 
 =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/do not send mail after signing. Default is to ask the user for each uid.
+Send mail after signing. Default is to ask the user for each uid.
 
+=item B<-M>, B<--no-mail>
+
+Do not send mail after signing. Default is to ask the user for each uid.
+
 =item B<-R>, B<--no-download>
 
 Do not retrieve the key to be signed from a keyserver.
@@ -669,10 +677,10 @@
 	'-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 @@
 
 		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";