auth.texi (GnuPG and EasyPG Assistant Configuration): Be agnostic about authinfo...

auth-source.el (auth-sources): Doc fix (Bug#16642)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 474b676..34e3f2d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-08  Glenn Morris  <rgm@gnu.org>
+
+       * auth-source.el (auth-sources): Doc fix.  (Bug#16642)
+
 2014-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-mime-buttonize-attachments-in-header): Display

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 0a3dccc..99f7d00 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -243,16 +243,9 @@ If the value is a function, debug messages are logged by calling
 
 (defcustom auth-sources '("~/.authinfo" "~/.authinfo.gpg" "~/.netrc")
   "List of authentication sources.
-
-The default will get login and password information from
-\"~/.authinfo.gpg\", which you should set up with the EPA/EPG
-packages to be encrypted.  If that file doesn't exist, it will
-try the unencrypted version \"~/.authinfo\" and the famous
-\"~/.netrc\" file.
-
-See the auth.info manual for details.
-
 Each entry is the authentication type with optional properties.
+Entries are tried in the order in which they appear.
+See Info node `(auth)Help for users' for details.
 
 It's best to customize this with `M-x customize-variable' because the choices
 can get pretty complex."

diff --git a/texi/ChangeLog b/texi/ChangeLog
index f1dea68..ed50161 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-08  Glenn Morris  <rgm@gnu.org>
+
+       * auth.texi (GnuPG and EasyPG Assistant Configuration):
+       Be agnostic about authinfo/authinfo.gpg default order.  (Bug#16642)
+
 2014-02-06  Glenn Morris  <rgm@gnu.org>
 
        * epa.texi (Mail-mode integration): Mention epa-mail-aliases.

diff --git a/texi/auth.texi b/texi/auth.texi
index e365345..ca81902 100644 (file)
--- a/texi/auth.texi
+++ b/texi/auth.texi
@@ -470,10 +470,10 @@ It returns the number of items forgotten.
 @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 @file{~/.authinfo.gpg}, which is a GnuPG encrypted file.  Then
-it will check @file{~/.authinfo} but it's not recommended to use such
-an unencrypted file.
+If the @code{auth-sources} variable contains @file{~/.authinfo.gpg}
+before @file{~/.authinfo}, the auth-source library will try to
+read the GnuPG encrypted @file{.gpg} file first, before
+the unencrypted file.
 
 In Emacs 23 or later there is an option @code{auto-encryption-mode} to
 automatically decrypt @file{*.gpg} files.  It is enabled by default.