diff options
Diffstat (limited to 'doc/gpg.sgml')
| -rw-r--r-- | doc/gpg.sgml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 8fc8a4059..910370ec2 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -937,22 +937,25 @@ each time. <listitem><para> This is a space or comma delimited string that gives options for the keyserver. Options can be prepended with a `no-' to give the opposite -meaning. While not all options are available for all keyserver -schemes, some common options are: +meaning. While not all options are available for all keyserver types, +some common options are: <variablelist> <varlistentry> <term>include-revoked</term> <listitem><para> When receiving or searching for a key, include keys that are marked on -the keyserver as revoked. +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. </para></listitem></varlistentry> <varlistentry> <term>include-disabled</term> <listitem><para> When receiving or searching for a key, include keys that are marked on -the keyserver as disabled. +the keyserver as disabled. Note that this option is not used with HKP +keyservers, as they do not support disabling keys. </para></listitem></varlistentry> <varlistentry> @@ -1470,7 +1473,9 @@ Try to be more RFC1991 (PGP 2.x) compliant. <listitem><para> Set up all options to be as PGP 2.x compliant as possible, and warn if an action is taken (e.g. encrypting to a non-RSA key) that will create -a message that PGP 2.x will not be able to handle. +a message that PGP 2.x will not be able to handle. Note that `PGP +2.x' here means `MIT PGP 2.6.2'. There are other versions of PGP 2.x +available, but the MIT release is a good common baseline. </para><para> This option implies `--rfc1991 --no-openpgp --no-force-v4-certs --no-comment --escape-from --no-force-v3-sigs --cipher-algo IDEA |