aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2002-04-03 14:57:44 +0000
committerDavid Shaw <[email protected]>2002-04-03 14:57:44 +0000
commit7e2e0b9950708a161add1d7dd37e6d3fe5747980 (patch)
treeec2d33e04d597bc2e7774ac329537525483ab50c
parentFix ownertrust display with --with-colons. (diff)
downloadgnupg-7e2e0b9950708a161add1d7dd37e6d3fe5747980.tar.gz
gnupg-7e2e0b9950708a161add1d7dd37e6d3fe5747980.zip
Documentation fixes.
auto-key-retrieve is a keyserver-option (noted by Roger Sondermann). --pgp2 also means --disable-mdc, --no-ask-sig-expire, and --no-ask-cert-expire. It does not mean --no-force-v3-sigs (noted by Timo).
-rw-r--r--doc/ChangeLog11
-rw-r--r--doc/gpg.sgml17
2 files changed, 16 insertions, 12 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ec7caf475..04d034b7e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,14 @@
+2002-04-03 David Shaw <[email protected]>
+
+ * gpg.sgml: auto-key-retrieve is a keyserver-option (noted by
+ Roger Sondermann).
+
+2002-03-27 David Shaw <[email protected]>
+
+ * gpg.sgml: --pgp2 also means --disable-mdc, --no-ask-sig-expire,
+ and --no-ask-cert-expire. It does not mean --no-force-v3-sigs
+ (noted by Timo).
+
2002-03-27 David Shaw <[email protected]>
* gpg.sgml: Add a few notes about --pgp2 meaning MIT PGP 2.6.2,
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 910370ec2..160eaef92 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -989,26 +989,18 @@ For keyserver schemes that use HTTP (such as HKP), try to access the
keyserver over the proxy set with the environment variable
"http_proxy".
</para></listitem></varlistentry>
-</variablelist>
-</para></listitem></varlistentry>
<varlistentry>
-<term>--auto-key-retrieve</term>
+<term>auto-key-retrieve</term>
<listitem><para>
This option enables the automatic retrieving of keys from a keyserver
when verifying signatures made by keys that are not on the local
keyring.
</para></listitem></varlistentry>
-<varlistentry>
-<term>--no-auto-key-retrieve</term>
-<listitem><para>
-This option disables the automatic retrieving of keys from a keyserver
-while verifying signatures. This may be of use if --auto-key-retrieve
-is enabled from an options file.
+</variablelist>
</para></listitem></varlistentry>
-
<varlistentry>
<term>--keyring &ParmFile;</term>
<listitem><para>
@@ -1477,8 +1469,9 @@ 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
+This option implies `--rfc1991 --no-openpgp --disable-mdc
+--no-force-v4-certs --no-comment --escape-from --force-v3-sigs
+--no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA
--digest-algo MD5 --compress-algo 1'
</para></listitem></varlistentry>