summaryrefslogtreecommitdiffstats
path: root/doc/gpg-agent.texi
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2014-06-24 13:46:52 +0200
committerWerner Koch <wk@gnupg.org>2014-06-24 13:46:52 +0200
commit74c7ab5fa636c7721dd7529d5bbfce70a47e5550 (patch)
treedc611f84dca007bd2db8ed18c2c006f833741ed3 /doc/gpg-agent.texi
parentdoc: Improve the description of gpg's --export commands. (diff)
downloadgnupg2-74c7ab5fa636c7721dd7529d5bbfce70a47e5550.tar.xz
gnupg2-74c7ab5fa636c7721dd7529d5bbfce70a47e5550.zip
doc: Add note regarding gpg-preset-passphrase and --max-cache-ttl.
-- GnuPG-bug-id: 1615
Diffstat (limited to 'doc/gpg-agent.texi')
-rw-r--r--doc/gpg-agent.texi11
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index bfb1d9353..c3dfd82b7 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -372,13 +372,16 @@ seconds. The default is 1800 seconds.
@opindex max-cache-ttl
Set the maximum time a cache entry is valid to @var{n} seconds. After
this time a cache entry will be expired even if it has been accessed
-recently. The default is 2 hours (7200 seconds).
+recently or has been set using @command{gpg-preset-passphrase}. The
+default is 2 hours (7200 seconds).
@item --max-cache-ttl-ssh @var{n}
@opindex max-cache-ttl-ssh
-Set the maximum time a cache entry used for SSH keys is valid to @var{n}
-seconds. After this time a cache entry will be expired even if it has
-been accessed recently. The default is 2 hours (7200 seconds).
+Set the maximum time a cache entry used for SSH keys is valid to
+@var{n} seconds. After this time a cache entry will be expired even
+if it has been accessed recently or has been set using
+@command{gpg-preset-passphrase}. The default is 2 hours (7200
+seconds).
@item --enforce-passphrase-constraints
@opindex enforce-passphrase-constraints