aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/DETAILS15
-rw-r--r--doc/gpg.texi9
2 files changed, 13 insertions, 11 deletions
diff --git a/doc/DETAILS b/doc/DETAILS
index e01b74ac1..0d86e4750 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -1724,17 +1724,10 @@ Description of some debug flags:
** gnupg.org notations
- - [email protected] :: Additional decryption subkey. This notation
- gives a list of keys an implementation SHOULD
- also encrypt to. The data consists of an array
- of eight-octet numbers holding the Key ID of an
- encryption subkey. This notation is only valid
- on an encryption subkey (i.e. with first octet
- of the key flags 0x04 or 0x08). Subkeys not on
- the same keyblock MUST NOT be considered. For
- interoperability this notation SHOULD NOT be
- marked as criticial. Due to its nature it MUST
- NOT be marked as human readable.
+ - [email protected] :: Used by Kleopatra to implement the tag feature.
+ These tags are used to mark keys for easier
+ searching and grouping.
+
** Simplified revocation certificates
Revocation certificates consist only of the signature packet;
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 45cd97241..01b91abec 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1067,6 +1067,15 @@ signing.
"sensitive". If a designated revoker is marked as sensitive, it will
not be exported by default (see export-options).
+ @item addadsk
+ @opindex keyedit:addadsk
+ Add an Additional Decryption Subkey. The user is asked to enter the
+ fingerprint of another encryption subkey. Note that the exact
+ fingerprint of another key's encryption subkey needs to be entered.
+ This is because commonly the primary key has no encryption
+ capability. Use the option @option{--with-subkey-fingerprint} with
+ a list command to display the subkey fingerprints.
+
@item passwd
@opindex keyedit:passwd
Change the passphrase of the secret key.