summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2002-08-22 19:48:47 +0200
committerDavid Shaw <dshaw@jabberwocky.com>2002-08-22 19:48:47 +0200
commitb6bbc5f6adb16022f2f61a7dd5a835672e771116 (patch)
tree56fda9c2c53105c8364fc4cd0b1501d40e877e45 /doc
parent* import.c (clean_subkeys, chk_self_sigs): Merge clean_subkeys into (diff)
downloadgnupg2-b6bbc5f6adb16022f2f61a7dd5a835672e771116.tar.xz
gnupg2-b6bbc5f6adb16022f2f61a7dd5a835672e771116.zip
* gpg.sgml: Clarify meaning of keyserver option include-revoked.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/gpg.sgml10
2 files changed, 10 insertions, 4 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0246feca7..6670c58e4 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-22 David Shaw <dshaw@jabberwocky.com>
+
+ * gpg.sgml: Clarify meaning of keyserver option include-revoked.
+
2002-08-20 David Shaw <dshaw@jabberwocky.com>
* DETAILS: Clarify that trust letters 'q' and '-' can be treated
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index e2effd555..6695534c6 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -980,10 +980,12 @@ keyserver types, some common options are:
<varlistentry>
<term>include-revoked</term>
<listitem><para>
-When receiving or 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 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).
</para></listitem></varlistentry>
<varlistentry>