Revision: emacs@sv.gnu.org/emacs--devo--0--patch-249

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 91-95)

   - Merge from emacs--devo--0
   - Update from CVS

2 files changed, 17 insertions, 0 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 020da464a18..1f417968fa9 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-26  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * pgg.texi (Caching passphrase): Fix markup and typos.  Simplify.
+
+2006-04-26  Sascha Wilde  <wilde@sha-bang.de>
+
+        * pgg.texi (Caching passphrase): Added documentation for
+        pgg-gpg-use-agent.
+
 2006-04-24  Bill Wohler  <wohler@newt.com>
 
         * mh-e.texi (Getting Started): Made it more explicit that you need
diff --git a/man/pgg.texi b/man/pgg.texi
index 80dce7a9639..b8934b526e3 100644
--- a/man/pgg.texi
+++ b/man/pgg.texi
@@ -234,6 +234,14 @@ variable to @code{nil}.
 Elapsed time for expiration in seconds.
 @end defvar
 
+@defvar pgg-gpg-use-agent
+When using GnuPG (gpg) as PGP scheme you can use @code{gpg-agent} for
+caching@footnote{Actually @code{gpg-agent} does not cache passphrases
+but private keys.  On the other hand, from a users point of view this
+technical difference isn't visible.}.  If non-@code{nil} try to use a
+running @code{gpg-agent}.  It defaults to @code{nil}.
+@end defvar
+
 @node Default user identity
 @section Default user identity