diff options
| author | Werner Koch <[email protected]> | 2009-03-05 19:19:37 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-03-05 19:19:37 +0000 |
| commit | 59d7a54e72aec2a64ec58ac66d550c17be91b27c (patch) | |
| tree | d32d7e71b998092594cb542b7250a3f6b8da533c /doc/gpg.texi | |
| parent | Fix segv. (diff) | |
| download | gnupg-59d7a54e72aec2a64ec58ac66d550c17be91b27c.tar.gz gnupg-59d7a54e72aec2a64ec58ac66d550c17be91b27c.zip | |
New PIN Callback attributes in gpg-agent.
Common prompts for keypad and simple card reader.
More support for Netkey cards; PIN management works now.
Diffstat (limited to 'doc/gpg.texi')
| -rw-r--r-- | doc/gpg.texi | 2 |
1 files changed, 1 insertions, 1 deletions
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. |