* gpg.sgml: --compress-algo now allows algorithm names.

* gpg.sgml: Document --trust-model.

* README.W32: Add blurb on how to create a ZIP file, changed requirement
for mingw32 to 0.3.2.

3 files changed, 65 insertions, 27 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index ec64629d7..4454ad311 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-14  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.sgml: --compress-algo now allows algorithm names.
+
+2002-11-13  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.sgml: Document --trust-model.
+
 2002-11-04  David Shaw  <dshaw@jabberwocky.com>
 
 	* KEYSERVER: New.  Documents the --with-colons format for
@@ -12,6 +20,11 @@
 	--hidden-encrypt-to, clarify --no-encrypt-to, clarify
 	--throw-keyid, document --no-throw-keyid.
 
+2002-10-25  Werner Koch  <wk@gnupg.org>
+
+        * README.W32: Add blurb on how to create a ZIP file, changed
+        requirement for mingw32 to 0.3.2.
+
 2002-10-24  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg.sgml: Document --refresh-keys.
diff --git a/doc/README.W32 b/doc/README.W32
index 61aa05f0e..f4d6e9f86 100644
--- a/doc/README.W32
+++ b/doc/README.W32
@@ -1,4 +1,5 @@
-This is a binary version of GnuPG for MS-Windows 95, 98, WNT and W2000.
+This is a binary version of GnuPG for MS-Windows 95, 98, WNT, W2000
+and XP.
 
 A FAQ comes with this package and a probably more recent one can be
 found online at http://www.gnupg.org/faq.html.  See
@@ -9,8 +10,8 @@ questions - but please read the FAQ first.
 Installation instructions:
 --------------------------
  1. Unpack the ZIP archive (alright, you already did this).
- 2. Copy "gpg.exe" and "gpgv.exe" to some place where you
-    usually store your binaries.
+ 2. Copy "gpg.exe", "gpgv.exe" and "gpgkeys_ldap.exe" to a place
+    where you usually store your binaries.
  3. Create a directory "c:\gnupg" (or any other as you like)
  4. If you did not use the default directory "c:\gnupg", you
     should enter a string with the directory into the Registry
@@ -72,7 +73,7 @@ Instructions are at the top of this file.
 
 To build it, you need the MingW32/CPD kit, which is available at
 
-  ftp://ftp.gnupg.org/people/werner/cpd/mingw32-cpd-0.3.0.tar.gz
+  ftp://ftp.gnupg.org/people/werner/cpd/mingw32-cpd-0.3.2.tar.gz
   ftp://ftp.gnupg.org/people/werner/cpd/gcc-core-2.95.2.tar.gz
   ftp://ftp.gnupg.org/people/werner/cpd/binutils-2.9.1.tar.gz
 
@@ -86,8 +87,11 @@ After you have installed this environment you should be able to do this:
  $ mingw32 strip g10/gpg.exe
  $ cp g10/gpg.exe  /some_windows_drive/
 
-And everything hopefully works. 
-
+And everything hopefully works.  If there is a make problem in the
+"po" directory you can eiterignore it or do a "touch po/all".  To
+build the distribtion ZIP file, you have to create a directory
+"dist-w32" and run "scripts/mk-w32-dist" right after a successul make
+run.
 
 Don't forget that MS-Windows ist just a temporary workaround until
 you can switch to a GNU system ;-)
@@ -95,6 +99,3 @@ you can switch to a GNU system ;-)
 Be the source always with you.
 
     Werner
-
-
-
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index d4a4514d8..91f4b0a5f 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -984,13 +984,36 @@ recipient's or signator's key.
 </para></listitem></varlistentry>
 
 <varlistentry>
+<term>--trust-model <parameter>openpgp|classic|always</parameter></term>
+<listitem><para>
+
+Set what trust model GnuPG should follow.  The models are:
+
+<variablelist>
+
+<varlistentry><term>openpgp</term><listitem><para>
+This is the web-of-trust combined with trust signatures as used in PGP
+5.x and later.  This is the default trust model.
+</para></listitem></varlistentry>
+
+<varlistentry><term>classic</term><listitem><para>
+This is the standard web-of-trust as used in PGP 2.x and earlier.
+</para></listitem></varlistentry>
+
+<varlistentry><term>always</term><listitem><para>
+Skip key validation and assume that used keys are always fully
+trusted.  You won't use this unless you have installed some external
+validation scheme.  This option also suppresses the "[uncertain]" tag
+printed with signature checks when there is no evidence that the user
+ID is bound to the key.
+</para></listitem></varlistentry>
+
+</variablelist></para></listitem></varlistentry>
+
+<varlistentry>
 <term>--always-trust</term>
 <listitem><para>
-Skip key validation and assume that used keys are always fully trusted.
-You won't use this unless you have installed some external validation
-scheme.  This option also suppresses the "[uncertain]" tag printed
-with signature checks when there is no evidence that the user ID
-is bound to the key.
+Identical to `--trust-model always'
 </para></listitem></varlistentry>
 
 
@@ -1531,6 +1554,20 @@ with the command --version yields a list of supported algorithms.
 
 
 <varlistentry>
+<term>--compress-algo &ParmName;</term>
+<listitem><para>
+Use compression algorithm &ParmName;.  "zlib" is RFC1950 ZLIB
+compression.  "zip" is RFC-1951 ZIP compression which is used by PGP.
+"uncompressed" or "none" 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>
+
+
+<varlistentry>
 <term>--cert-digest-algo &ParmName;</term>
 <listitem><para>
 Use &ParmName; as the message digest algorithm used when signing a
@@ -1589,19 +1626,6 @@ 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.
-</para></listitem></varlistentry>
-
-
-<varlistentry>
 <term>--disable-cipher-algo &ParmName;</term>
 <listitem><para>
 Never allow the use of &ParmName; as cipher algorithm.