aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/gpg.sgml27
2 files changed, 26 insertions, 5 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 953b0e772..64fd2433e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-13 David Shaw <[email protected]>
+
+ * gpg.sgml: Document --trust-model.
+
2002-11-04 David Shaw <[email protected]>
* DETAILS: Clarify meaning of 'u'. Noted by Timo.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 26927f84b..486ec2305 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -955,13 +955,30 @@ recipient's or signator's key.
</para></listitem></varlistentry>
<varlistentry>
+<term>--trust-model <parameter>classic|always</parameter></term>
+<listitem><para>
+
+Set what trust model GnuPG should follow. The models are:
+
+<variablelist>
+
+<varlistentry><term>classic</term><listitem><para>
+This is the regular web-of-trust as used in PGP and GnuPG.
+</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>