Add a note in caffrc.sample about using the -u option to select which keyid

from the CONFIG{'keyid'} as to be used for signing.
Suggested by Micah Anderson due to bug #482693.

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

diff --git a/caff/caffrc.sample b/caff/caffrc.sample
index dae022944b0311ca933ece70cfb64ce01f587d08..b6a69a34effa2e654bd72a808d35acf9ea31313c 100644 (file)
--- a/caff/caffrc.sample
+++ b/caff/caffrc.sample
@@ -10,6 +10,9 @@ $CONFIG{'email'}       = 'user@example.com';
 # if you have a v4 key, it will simply be the last 16 digits of
 # your fingerprint.
 
+# You can define multiple keys below, but be aware that caff will use
+# the first key defined by default and will not use the second one
+# unless you explicitly mention it through the -u option on the command-line
 $CONFIG{'keyid'}       = [ qw{DE7AAF6E94C09C7F 62AF4031C82E0039} ];
 $CONFIG{'also-encrypt-to'} = [ qw{DE7AAF6E94C09C7F} ];
 $CONFIG{'caffhome'}    = $ENV{'HOME'}.'/.caff';

diff --git a/debian/changelog b/debian/changelog
index bfa122a4dbe65c751fa1e3c1fb1413edd7a0ab6a..0735545e1baac3bd3b688db97f9e0de659e0ef7a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,12 @@ signing-party (1.1-3) unstable; urgency=low
 
   [ Franck Joncourt ]
   * caff:
-    + Take the mail config variable from .caffrc into count.
+    + Take the CONFIG{'mail'} variable from .caffrc into count.
       (Closes: #520387)
     + Update caff's manpage to mention a keyid specified with -u requires to
       be listed in the configuration file through the keyid variable.
+      Add a note in caffrc.sample about using the -u option to select which keyid
+      from the CONFIG{'keyid'} as to be used for signing. 
       (Closes: #482693)
 
  -- Christoph Berg <myon@debian.org>  Tue, 10 Mar 2009 17:18:21 +0100