diff options
-rw-r--r-- | doc/ChangeLog | 7 | ||||
-rw-r--r-- | doc/DETAILS | 2 | ||||
-rw-r--r-- | doc/gpg.sgml | 11 |
3 files changed, 19 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 7502d2eef..91a1c82c6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,10 @@ +2002-08-30 David Shaw <[email protected]> + + * gpg.sgml: Document keyserver-option include-subkeys. Note that + honor-http-proxy is a keyserver-option now. + + * DETAILS: Add "Key not trusted" to INV_RECP status code. + 2002-08-23 Werner Koch <[email protected]> * faq.raw: Updated. New Maintainer is David D. Scribner. diff --git a/doc/DETAILS b/doc/DETAILS index 45862f372..5c5eb07b7 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -364,6 +364,8 @@ more arguments in future versions. 7 := "CRL too old" 8 := "Policy mismatch" 9 := "Not a secret key" + 10 := "Key not trusted" + Note that this status is also used for gpgsm's SIGNER command where it relates to signer's of course. diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 6695534c6..0abf4c62e 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -997,6 +997,14 @@ keyservers, as they do not support disabling keys. </para></listitem></varlistentry> <varlistentry> +<term>include-subkeys</term> +<listitem><para> +When receiving a key, include subkeys in the search. Note that this +option is not used with HKP keyservers, as they do not support +retrieving keys by subkey id. +</para></listitem></varlistentry> + +<varlistentry> <term>use-temp-files</term> <listitem><para> On most Unix-like platforms, GnuPG communicates with the keyserver @@ -2328,7 +2336,8 @@ be used to overide it.</para></listitem> </varlistentry> <varlistentry> <term>http_proxy</term> -<listitem><para>Only honored when the option --honor-http-proxy is set.</para></listitem> +<listitem><para>Only honored when the keyserver-option +honor-http-proxy is set.</para></listitem> </varlistentry> </variablelist> |