From 488b8dadba3e3399ee41d26c4571d00526641cfb Mon Sep 17 00:00:00 2001 From: David Shaw Date: Wed, 11 Dec 2002 03:47:03 +0000 Subject: * gpg.sgml: Clarify include-revoked and include-disabled so they match what the program actually does. Noted by Dick Gevers. * gpg.sgml: Document %-expandos for policy URLs and notations. * gpg.sgml: Document --pgp8. Clarify that --pgp6 and --pgp7 disable --throw-keyid. --- doc/ChangeLog | 10 ++++++++++ doc/gpg.sgml | 59 ++++++++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 54 insertions(+), 15 deletions(-) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 850c7400f..598d5fd2d 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,13 @@ +2002-12-10 David Shaw + + * gpg.sgml: Clarify include-revoked and include-disabled so they + match what the program actually does. Noted by Dick Gevers. + + * gpg.sgml: Document %-expandos for policy URLs and notations. + + * gpg.sgml: Document --pgp8. Clarify that --pgp6 and --pgp7 + disable --throw-keyid. + 2002-12-05 Werner Koch * gpg.sgml: Document --no-mangle-dos-filenames. diff --git a/doc/gpg.sgml b/doc/gpg.sgml index f653f8fc2..438ace247 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -1065,27 +1065,25 @@ keyserver types, some common options are: include-revoked -When searching for a key, include keys that are marked on the -keyserver as revoked. Note that this option is always set when using -the NAI HKP keyserver, as this keyserver does not differentiate -between revoked and unrevoked keys. When using the LDAP keyserver, -this applies to both searching (--search-keys) and receiving -(--recv-keys). +When searching for a key with --search-keys, include keys that are +marked on the keyserver as revoked. Note that this option is always +set when using the NAI HKP keyserver, as this keyserver does not +differentiate between revoked and unrevoked keys. include-disabled -When receiving or searching for a key, include keys that are marked on -the keyserver as disabled. Note that this option is not used with HKP -keyservers, as they do not support disabling keys. +When searching for a key with --search-keys, include keys that are +marked on the keyserver as disabled. Note that this option is not +used with HKP keyservers. include-subkeys -When receiving a key, include subkeys in the search. Note that this -option is not used with HKP keyservers, as they do not support +When receiving a key, include subkeys as potential targets. Note that +this option is not used with HKP keyservers, as they do not support retrieving keys by subkey id. @@ -1471,7 +1469,19 @@ notation data will be flagged as critical (rfc2440:5.2.3.15). --sig-notation sets a notation for data signatures. --cert-notation sets a notation for key signatures (certifications). --notation-data sets both. - + + + +There are special codes that may be used in notation names. "%k" will +be expanded into the key ID of the key being signed, "%K" for the long +key ID of the key being signed, "%f" for the key fingerprint of the +key being signed, "%s" for the key ID of the key making the signature, +"%S" for the long key ID of the key making the signature, and "%%" +results in a single "%". %k, %K, and %f are only meaningful when +making a key signature (certification). + + + --show-notation @@ -1496,6 +1506,10 @@ you prefix it with an exclamation mark, the policy URL packet will be flagged as critical. --sig-policy-url sets a a policy url for data signatures. --cert-policy-url sets a policy url for key signatures (certifications). -set-policy-url sets both. + + + +The same %-expandos used for notation data are available here as well. @@ -1813,9 +1827,9 @@ Resets the --pgp2 option. Set up all options to be as PGP 6 compliant as possible. This restricts you to the ciphers IDEA (if the IDEA plugin is installed), 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160, and the -compression algorithms none and ZIP. This also disables making -signatures with signing subkeys as PGP 6 does not understand -signatures made by signing subkeys. +compression algorithms none and ZIP. This also disables +--throw-keyid, and making signatures with signing subkeys as PGP 6 +does not understand signatures made by signing subkeys. This option implies `--disable-mdc --no-comment --escape-from-lines --force-v3-sigs --no-ask-sig-expire --compress-algo 1' @@ -1842,6 +1856,21 @@ TWOFISH. Resets the --pgp7 option. + +--pgp8 + +Set up all options to be as PGP 8 compliant as possible. PGP 8 is a +lot closer to the OpenPGP standard than previous versions of PGP, so +all this does is disable --throw-keyid and set --escape-from-lines and +--compress-algo 1. The allowed algorithms list is the same as --pgp7. + + + +--no-pgp8 + +Resets the --pgp8 option. + + --openpgp -- cgit v1.2.3