aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2002-11-14 22:06:58 +0000
committerDavid Shaw <[email protected]>2002-11-14 22:06:58 +0000
commitc028cac7abf810dde7b5bc53f73b38465691c3d7 (patch)
tree3c42b7b67944514ba631f17cbe9e37691544da7b
parent* gpg.sgml: Document --trust-model. (diff)
downloadgnupg-c028cac7abf810dde7b5bc53f73b38465691c3d7.tar.gz
gnupg-c028cac7abf810dde7b5bc53f73b38465691c3d7.zip
* gpg.sgml: Correct --compress-algo documentation to match behavior.
Noted by Jason S. Mantor.
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/gpg.sgml15
2 files changed, 13 insertions, 7 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 64fd2433e..8866e6af7 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-14 David Shaw <[email protected]>
+
+ * gpg.sgml: Correct --compress-algo documentation to match
+ behavior. Noted by Jason S. Mantor.
+
2002-11-13 David Shaw <[email protected]>
* gpg.sgml: Document --trust-model.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 486ec2305..2d634adfc 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1579,13 +1579,14 @@ same value is acceptable).
<varlistentry>
<term>--compress-algo &ParmN;</term>
<listitem><para>
-Use compression algorithm &ParmN;. Default is 2 which is RFC1950
-compression. You may use 1 to use the old zlib version (RFC1951) which
-is used by PGP. 0 disables compression. The default algorithm may give
-better results because the window size is not limited to 8K. If this
-is not used the OpenPGP behavior is used, i.e. the compression
-algorithm is selected from the preferences; note, that this can't be
-done if you do not encrypt the data.
+Use compression algorithm &ParmN;. The value 2 is RFC1950 ZLIB
+compression. The value 1 is RFC-1951 ZIP compression which is used by
+PGP. 0 disables compression. If this option is not used, the default
+behavior is to examine the recipient key preferences to see which
+algorithms the recipient supports. If all else fails, ZIP is used for
+maximum compatibility. Note, however, that ZLIB may give better
+compression results if that is more important, as the compression
+window size is not limited to 8k.
</para></listitem></varlistentry>