Clarify the doc about caching passphrases.

* epa.texi (Caching Passphrases):
* auth.texi (GnuPG and EasyPG Assistant Configuration): Clarify
some configurations require to set up gpg-agent.

3 files changed, 22 insertions, 16 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b82e523a355..adf5fd9b010 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-12  Daiki Ueno  <ueno@unixuser.org>
+
+        * epa.texi (Caching Passphrases):
+        * auth.texi (GnuPG and EasyPG Assistant Configuration): Clarify
+        some configurations require to set up gpg-agent.
+
 2010-10-11  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index f7ee7b9f3de..66fe860fc0d 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -267,24 +267,24 @@ users' netrc files.
 @node GnuPG and EasyPG Assistant Configuration
 @appendix GnuPG and EasyPG Assistant Configuration
 
+If you don't customize @code{auth-sources}, the auth-source library
+reads @code{~/.authinfo.gpg}, which is a GnuPG encrypted file.
+
 In Emacs 23 or later there is an option @code{auto-encryption-mode} to
-automatically decrypt @code{*.gpg} files and it is enabled by default
-so there is no setting is needed.  If you are using earlier versions
-of Emacs for some reason, you will need:
+automatically decrypt @code{*.gpg} files.  It is enabled by default so
+there is no setting is needed.  If you are using earlier versions of
+Emacs, you will need:
 
 @lisp
 (require 'epa-file)
 (epa-file-enable)
 @end lisp
 
-If you want your GnuPG passwords to be cached, setup @code{gpg-agent}
+If you want your GnuPG passwords to be cached, set up @code{gpg-agent}
 or EasyPG Assitant
 @pxref{Caching Passphrases, , Caching Passphrases, epa}
 
-For those who are using older vesions of Emacs, here are some portion
-copied from the EasyPG Assitant manual:
-
-Here are some questions:
+To quick start, here are some questions:
 
 @enumerate
 @item Do you use GnuPG version 2 instead of GnuPG version 1?
@@ -296,17 +296,17 @@ Here are configurations depending on your answers:
 
 @multitable {111} {222} {333} {configuration configuration configuration}
 @item @b{1} @tab @b{2} @tab @b{3} @tab Configuration
-@item Yes @tab Yes @tab Yes @tab Nothing to do.
+@item Yes @tab Yes @tab Yes @tab Set up gpg-agent.
 @item Yes @tab Yes @tab No @tab You can't, without gpg-agent.
-@item Yes @tab No @tab Yes @tab Nothing to do.
+@item Yes @tab No @tab Yes @tab Set up gpg-agent.
 @item Yes @tab No @tab No @tab You can't, without gpg-agent.
 @item No @tab Yes @tab Yes @tab Set up elisp passphrase cache.
 @item No @tab Yes @tab No @tab Set up elisp passphrase cache.
-@item No @tab No @tab Yes @tab Nothing to do.
+@item No @tab No @tab Yes @tab Set up gpg-agent.
 @item No @tab No @tab No @tab You can't, without gpg-agent.
 @end multitable
 
-To setup gpg-agent, follow the instruction in GnuPG manual.
+To set up gpg-agent, follow the instruction in GnuPG manual.
 @pxref{Invoking GPG-AGENT, , Invoking GPG-AGENT, gnupg}.
 
 To set up elisp passphrase cache, set
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 7d4c66fdd28..32bf9e7fe1d 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -420,17 +420,17 @@ Here are configurations depending on your answers:
 
 @multitable {111} {222} {333} {configuration configuration configuration}
 @item @b{1} @tab @b{2} @tab @b{3} @tab Configuration
-@item Yes @tab Yes @tab Yes @tab Nothing to do.
+@item Yes @tab Yes @tab Yes @tab Set up gpg-agent.
 @item Yes @tab Yes @tab No @tab You can't, without gpg-agent.
-@item Yes @tab No @tab Yes @tab Nothing to do.
+@item Yes @tab No @tab Yes @tab Set up gpg-agent.
 @item Yes @tab No @tab No @tab You can't, without gpg-agent.
 @item No @tab Yes @tab Yes @tab Set up elisp passphrase cache.
 @item No @tab Yes @tab No @tab Set up elisp passphrase cache.
-@item No @tab No @tab Yes @tab Nothing to do.
+@item No @tab No @tab Yes @tab Set up gpg-agent.
 @item No @tab No @tab No @tab You can't, without gpg-agent.
 @end multitable
 
-To setup gpg-agent, follow the instruction in GnuPG manual.
+To set up gpg-agent, follow the instruction in GnuPG manual.
 @pxref{Invoking GPG-AGENT, , Invoking GPG-AGENT, gnupg}.
 
 To set up elisp passphrase cache, set