summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2022-12-16 11:00:16 +0100
committerWerner Koch <wk@gnupg.org>2022-12-16 11:01:24 +0100
commitfc8b811283d73251ddc97c649f0babe3005bb20b (patch)
treeb37abb51be3c612db2f10270f981155fb5d97bbb /doc
parentdoc: Typo fixes (diff)
downloadgnupg2-fc8b811283d73251ddc97c649f0babe3005bb20b.tar.xz
gnupg2-fc8b811283d73251ddc97c649f0babe3005bb20b.zip
Update NEWS for 2.4.0
Diffstat (limited to 'doc')
-rw-r--r--doc/gpg.texi6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index a50252d38..804ecf94a 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1754,7 +1754,8 @@ Set what trust model GnuPG should follow. The models are:
@item tofu
@opindex trust-model:tofu
@anchor{trust-model-tofu}
- TOFU stands for Trust On First Use. In this trust model, the first
+ TOFU stands for Trust On First Use. In this experimental trust
+ model, the first
time a key is seen, it is memorized. If later another key with a
user id with the same email address is seen, both keys are marked as
suspect. In that case, the next time either is used, a warning is
@@ -1803,7 +1804,8 @@ Set what trust model GnuPG should follow. The models are:
@item tofu+pgp
@opindex trust-model:tofu+pgp
- This trust model combines TOFU with the Web of Trust. This is done
+ This experimental trust model combines TOFU with the Web of Trust.
+ This is done
by computing the trust level for each model and then taking the
maximum trust level where the trust levels are ordered as follows:
@code{unknown < undefined < marginal < fully < ultimate < expired <