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 /doc/misc | |
| 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 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/auth.texi | 8 |
2 files changed, 9 insertions, 4 deletions
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 @@ | |||
| 1 | 2014-02-08 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * auth.texi (GnuPG and EasyPG Assistant Configuration): | ||
| 4 | Be agnostic about authinfo/authinfo.gpg default order. (Bug#16642) | ||
| 5 | |||
| 1 | 2014-02-07 Glenn Morris <rgm@gnu.org> | 6 | 2014-02-07 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * viper.texi (File and Buffer Handling): Prefer ido to iswitchb. | 8 | * 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. | |||
| 470 | @node GnuPG and EasyPG Assistant Configuration | 470 | @node GnuPG and EasyPG Assistant Configuration |
| 471 | @appendix GnuPG and EasyPG Assistant Configuration | 471 | @appendix GnuPG and EasyPG Assistant Configuration |
| 472 | 472 | ||
| 473 | If you don't customize @code{auth-sources}, the auth-source library | 473 | If the @code{auth-sources} variable contains @file{~/.authinfo.gpg} |
| 474 | reads @file{~/.authinfo.gpg}, which is a GnuPG encrypted file. Then | 474 | before @file{~/.authinfo}, the auth-source library will try to |
| 475 | it will check @file{~/.authinfo} but it's not recommended to use such | 475 | read the GnuPG encrypted @file{.gpg} file first, before |
| 476 | an unencrypted file. | 476 | the unencrypted file. |
| 477 | 477 | ||
| 478 | In Emacs 23 or later there is an option @code{auto-encryption-mode} to | 478 | In Emacs 23 or later there is an option @code{auto-encryption-mode} to |
| 479 | automatically decrypt @file{*.gpg} files. It is enabled by default. | 479 | automatically decrypt @file{*.gpg} files. It is enabled by default. |