New PIN Callback attributes in gpg-agent.

Common prompts for keypad and simple card reader.
More support for Netkey cards;  PIN management works now.

3 files changed, 17 insertions, 2 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 780d71377..09acabcf8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-04  Werner Koch  <[email protected]>
+
+	* help.txt (gpg.keygen.size): Add a link to web page.
+
+2009-03-03  Werner Koch  <[email protected]>
+
+	* gpg.texi (Operational GPG Commands): "merge-only" is an
+	import-option.  Reported by Joseph Oreste Bruni.
+
 2009-03-02  Werner Koch  <[email protected]>
 
 	* gpg-agent.texi (Invoking GPG-AGENT): Modernized instructions.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index d514c5631..c66b3df6e 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -425,7 +425,7 @@ Import/merge keys. This adds the given keys to the
 keyring. The fast version is currently just a synonym.
 
 There are a few other options which control how this command works.
-Most notable here is the @option{--keyserver-options merge-only} option
+Most notable here is the @option{--import-options merge-only} option
 which does not insert new keys but does only the merging of new
 signatures, user-IDs and subkeys.
 
diff --git a/doc/help.txt b/doc/help.txt
index a3322ee67..c4cc3d11a 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -135,7 +135,13 @@ Please consult your security expert first.
 
 
 .gpg.keygen.size
-Enter the size of the key.
+Enter the size of the key.  
+
+The suggested default is usually a good choice.
+
+If you want to use a large key size, for example 4096 bit, please
+think again whether it really makes sense for you.  You may want 
+to view the web page http://www.xkcd.com/538/ .
 .
 
 .gpg.keygen.size.huge.okay