diff options
| author | Ted Zlatanov | 2012-05-01 22:28:14 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2012-05-01 22:28:14 +0000 |
| commit | 723ea6b5d6b03418d2f7e273c82aa91732ace079 (patch) | |
| tree | c764ff5242de2fe6220d424ae52cfea605fe89e8 | |
| parent | 976f7668ab5166673c3010eed82bae8ea8a30b69 (diff) | |
| download | emacs-723ea6b5d6b03418d2f7e273c82aa91732ace079.tar.gz emacs-723ea6b5d6b03418d2f7e273c82aa91732ace079.zip | |
auth.texi (Help for users): Update for .gpg file being second
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/auth.texi | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 0a013e18364..62841734d9f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-05-01 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 2 | |||
| 3 | * auth.texi (Help for users): Update for .gpg file being second. | ||
| 4 | |||
| 1 | 2012-04-27 Ippei Furuhashi <top.tuna+orgmode@gmail.com> (tiny change) | 5 | 2012-04-27 Ippei Furuhashi <top.tuna+orgmode@gmail.com> (tiny change) |
| 2 | 6 | ||
| 3 | * org.texi (Agenda commands): Fix two typos: give corresponding | 7 | * org.texi (Agenda commands): Fix two typos: give corresponding |
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index 4ce4e337a0f..3a1e4155e97 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi | |||
| @@ -180,12 +180,15 @@ Here's a mixed example using two sources: | |||
| 180 | @end defvar | 180 | @end defvar |
| 181 | 181 | ||
| 182 | If you don't customize @code{auth-sources}, you'll have to live with | 182 | If you don't customize @code{auth-sources}, you'll have to live with |
| 183 | the defaults: any host and any port are looked up in the netrc | 183 | the defaults: the unencrypted netrc file @file{~/.authinfo} will be |
| 184 | file @file{~/.authinfo.gpg}, which is a GnuPG encrypted file | 184 | used for any host and any port. |
| 185 | (@pxref{GnuPG and EasyPG Assistant Configuration}). | ||
| 186 | 185 | ||
| 187 | If that fails, the unencrypted netrc files @file{~/.authinfo} and | 186 | If that fails, any host and any port are looked up in the netrc file |
| 188 | @file{~/.netrc} will be used. | 187 | @file{~/.authinfo.gpg}, which is a GnuPG encrypted file (@pxref{GnuPG |
| 188 | and EasyPG Assistant Configuration}). | ||
| 189 | |||
| 190 | Finally, the unencrypted netrc file @file{~/.netrc} will be used for | ||
| 191 | any host and any port. | ||
| 189 | 192 | ||
| 190 | The typical netrc line example is without a port. | 193 | The typical netrc line example is without a port. |
| 191 | 194 | ||