aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/gpg-agent.texi6
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 39d98b963..a920022d0 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-03 Werner Koch <[email protected]>
+
+ * gpg-agent.texi (Agent Options): Add --allow-mark-trusted.
+
2004-02-03 Werner Koch <[email protected]>
* contrib.texi (Contributors): Updated from the gpg 1.2.3 thanks
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index e199109a4..aad0fbb68 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -238,6 +238,12 @@ seeing what the agent actually does.
Don't allow multiple connections. This option is in general not very
useful.
+@item --allow-mark-trusted
+@opindex allow-mark-trusted
+Allow clients to mark keys as trusted, i.e. put them into the
+@code{trustlist.txt} file. This is by default not allowed to make it
+harder for users to inadvertly accept Root-CA keys.
+
@item --ignore-cache-for-signing
@opindex ignore-cache-for-signing
This option will let gpg-agent bypass the passphrase cache for all