From 4017bbc6836499e0360fe6608166de8b10a5bc2e Mon Sep 17 00:00:00 2001 From: David Shaw Date: Wed, 11 Dec 2002 03:41:52 +0000 Subject: [PATCH] * gpg.sgml: Clarify include-revoked and include-disabled so they match what the program actually does. Noted by Dick Gevers. --- doc/ChangeLog | 5 +++++ doc/gpg.sgml | 20 +++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 45e89e500..3bb4d43ef 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +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. + 2002-12-06 David Shaw * gpg.sgml: Document %-expandos for policy URLs and notations. diff --git a/doc/gpg.sgml b/doc/gpg.sgml index d96170c70..0be0d34a5 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -1030,27 +1030,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.