aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Zlatanov2012-05-01 22:28:14 +0000
committerKatsumi Yamaoka2012-05-01 22:28:14 +0000
commit723ea6b5d6b03418d2f7e273c82aa91732ace079 (patch)
treec764ff5242de2fe6220d424ae52cfea605fe89e8
parent976f7668ab5166673c3010eed82bae8ea8a30b69 (diff)
downloademacs-723ea6b5d6b03418d2f7e273c82aa91732ace079.tar.gz
emacs-723ea6b5d6b03418d2f7e273c82aa91732ace079.zip
auth.texi (Help for users): Update for .gpg file being second
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/auth.texi13
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 @@
12012-05-01 Teodor Zlatanov <tzz@lifelogs.com>
2
3 * auth.texi (Help for users): Update for .gpg file being second.
4
12012-04-27 Ippei Furuhashi <top.tuna+orgmode@gmail.com> (tiny change) 52012-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
182If you don't customize @code{auth-sources}, you'll have to live with 182If you don't customize @code{auth-sources}, you'll have to live with
183the defaults: any host and any port are looked up in the netrc 183the defaults: the unencrypted netrc file @file{~/.authinfo} will be
184file @file{~/.authinfo.gpg}, which is a GnuPG encrypted file 184used for any host and any port.
185(@pxref{GnuPG and EasyPG Assistant Configuration}).
186 185
187If that fails, the unencrypted netrc files @file{~/.authinfo} and 186If 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
188and EasyPG Assistant Configuration}).
189
190Finally, the unencrypted netrc file @file{~/.netrc} will be used for
191any host and any port.
189 192
190The typical netrc line example is without a port. 193The typical netrc line example is without a port.
191 194