diff options
| author | Glenn Morris | 2014-02-07 21:07:55 -0500 |
|---|---|---|
| committer | Glenn Morris | 2014-02-07 21:07:55 -0500 |
| commit | 36f1351eb90c3af31245fea0f46cb09ca3b08427 (patch) | |
| tree | 72a4679f703e937242841c9a15d2d2d5c659dad5 /lisp | |
| parent | 41a4a82fa19abb3f615a41215d56165a3138102b (diff) | |
| download | emacs-36f1351eb90c3af31245fea0f46cb09ca3b08427.tar.gz emacs-36f1351eb90c3af31245fea0f46cb09ca3b08427.zip | |
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
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/auth-source.el | 11 |
2 files changed, 6 insertions, 9 deletions
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 @@ | |||
| 1 | 2014-02-08 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * auth-source.el (auth-sources): Doc fix. (Bug#16642) | ||
| 4 | |||
| 1 | 2014-02-07 Lars Ingebrigtsen <larsi@gnus.org> | 5 | 2014-02-07 Lars Ingebrigtsen <larsi@gnus.org> |
| 2 | 6 | ||
| 3 | * ietf-drums.el (ietf-drums-parse-address): Don't bug out when called | 7 | * 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 | |||
| 233 | 233 | ||
| 234 | (defcustom auth-sources '("~/.authinfo" "~/.authinfo.gpg" "~/.netrc") | 234 | (defcustom auth-sources '("~/.authinfo" "~/.authinfo.gpg" "~/.netrc") |
| 235 | "List of authentication sources. | 235 | "List of authentication sources. |
| 236 | |||
| 237 | The default will get login and password information from | ||
| 238 | \"~/.authinfo.gpg\", which you should set up with the EPA/EPG | ||
| 239 | packages to be encrypted. If that file doesn't exist, it will | ||
| 240 | try the unencrypted version \"~/.authinfo\" and the famous | ||
| 241 | \"~/.netrc\" file. | ||
| 242 | |||
| 243 | See the auth.info manual for details. | ||
| 244 | |||
| 245 | Each entry is the authentication type with optional properties. | 236 | Each entry is the authentication type with optional properties. |
| 237 | Entries are tried in the order in which they appear. | ||
| 238 | See Info node `(auth)Help for users' for details. | ||
| 246 | 239 | ||
| 247 | It's best to customize this with `M-x customize-variable' because the choices | 240 | It's best to customize this with `M-x customize-variable' because the choices |
| 248 | can get pretty complex." | 241 | can get pretty complex." |