[Emacs-diffs] trunk r116312: auth-sources doc fixes

[Glenn Morris]

------------------------------------------------------------
revno: 116312
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16642
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-07 21:07:55 -0500
message:
  auth-sources doc fixes
  
  * doc/misc/auth.texi (GnuPG and EasyPG Assistant Configuration):
  Be agnostic about authinfo/authinfo.gpg default order. 
  
  * lisp/gnus/auth-source.el (auth-sources): Doc fix.
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/auth.texi             auth.texi-20091113204419-o5vbwnq5f7feedwu-8826
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/auth-source.el       
authsource.el-20091113204419-o5vbwnq5f7feedwu-8608

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2014-02-07 03:22:34 +0000
+++ b/doc/misc/ChangeLog        2014-02-08 02:07:55 +0000
@@ -1,3 +1,8 @@
+2014-02-08  Glenn Morris  <address@hidden>
+
+       * auth.texi (GnuPG and EasyPG Assistant Configuration):
+       Be agnostic about authinfo/authinfo.gpg default order.  (Bug#16642)
+
 2014-02-07  Glenn Morris  <address@hidden>
 
        * viper.texi (File and Buffer Handling): Prefer ido to iswitchb.

=== modified file 'doc/misc/auth.texi'
--- a/doc/misc/auth.texi        2014-01-06 05:25:46 +0000
+++ b/doc/misc/auth.texi        2014-02-08 02:07:55 +0000
@@ -470,10 +470,10 @@
 @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.

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-02-07 03:06:44 +0000
+++ b/lisp/gnus/ChangeLog       2014-02-08 02:07:55 +0000
@@ -1,3 +1,7 @@
+2014-02-08  Glenn Morris  <address@hidden>
+
+       * auth-source.el (auth-sources): Doc fix.  (Bug#16642)
+
 2014-02-07  Lars Ingebrigtsen  <address@hidden>
 
        * ietf-drums.el (ietf-drums-parse-address): Don't bug out when called

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2014-01-01 07:43:34 +0000
+++ b/lisp/gnus/auth-source.el  2014-02-08 02:07:55 +0000
@@ -233,16 +233,9 @@
 
 (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."