aboutsummaryrefslogtreecommitdiffstats
path: root/doc/gpg.sgml
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--doc/gpg.sgml11
1 files changed, 10 insertions, 1 deletions
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>