2 files changed, 11 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f0eed1897b..aac29e86ad6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-28  Daiki Ueno  <ueno@gnu.org>
+
+        * epa-file.el
+        (epa-file-cache-passphrase-for-symmetric-encryption): Document
+        that this option has no effect with GnuPG 2.0 (bug#15552).
+
 2013-10-27  Xue Fuqiao  <xfq.free@gmail.com>
 
         * image.el (defimage):
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 5de768b426e..e3a91ac7c25 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -29,9 +29,11 @@
   "If non-nil, cache passphrase for symmetric encryption.
 
 For security reasons, this option is turned off by default and
-not recommended to use.  Instead, consider using public-key
-encryption with gpg-agent which does the same job in a safer
-way."
+not recommended to use.  Instead, consider using gpg-agent which
+does the same job in a safer way.  See Info node `(epa) Caching
+Passphrases' for more information.
+
+Note that this option has no effect if you use GnuPG 2.0."
   :type 'boolean
   :group 'epa-file)