From: Glenn Morris Date: Sat, 8 Feb 2014 02:07:55 +0000 (-0500) Subject: auth-sources doc fixes X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~124 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=36f1351eb90c3af31245fea0f46cb09ca3b08427;p=emacs.git 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. Fixes: debbugs:16642 --- diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 766286c5fa7..5e120ca3f6a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2014-02-08 Glenn Morris + + * auth.texi (GnuPG and EasyPG Assistant Configuration): + Be agnostic about authinfo/authinfo.gpg default order. (Bug#16642) + 2014-02-07 Glenn Morris * viper.texi (File and Buffer Handling): Prefer ido to iswitchb. diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index f240b38c27e..993062f8082 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/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. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index a0ed0360971..9e3f2c9e845 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2014-02-08 Glenn Morris + + * auth-source.el (auth-sources): Doc fix. (Bug#16642) + 2014-02-07 Lars Ingebrigtsen * ietf-drums.el (ietf-drums-parse-address): Don't bug out when called diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el index cef88e95b92..6cdc3a853b9 100644 --- a/lisp/gnus/auth-source.el +++ b/lisp/gnus/auth-source.el @@ -233,16 +233,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."