[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108088: auth.texi (Help for users): Update for .gpg file being second

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 108088
author: Ted Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-01 22:28:14 +0000
message:
  auth.texi (Help for users): Update for .gpg file being second
modified:
  doc/misc/ChangeLog
  doc/misc/auth.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-04-27 06:08:14 +0000
+++ b/doc/misc/ChangeLog        2012-05-01 22:28:14 +0000
@@ -1,3 +1,7 @@
+2012-05-01  Teodor Zlatanov  <address@hidden>
+
+       * auth.texi (Help for users): Update for .gpg file being second.
+
 2012-04-27  Ippei Furuhashi  <address@hidden>  (tiny change)
 
        * org.texi (Agenda commands): Fix two typos: give corresponding

=== modified file 'doc/misc/auth.texi'
--- a/doc/misc/auth.texi        2012-04-06 01:56:38 +0000
+++ b/doc/misc/auth.texi        2012-05-01 22:28:14 +0000
@@ -180,12 +180,15 @@
 @end defvar
 
 If you don't customize @code{auth-sources}, you'll have to live with
-the defaults: any host and any port are looked up in the netrc
-file @file{~/.authinfo.gpg}, which is a GnuPG encrypted file
-(@pxref{GnuPG and EasyPG Assistant Configuration}).
-
-If that fails, the unencrypted netrc files @file{~/.authinfo} and
address@hidden/.netrc} will be used.
+the defaults: the unencrypted netrc file @file{~/.authinfo} will be
+used for any host and any port.
+
+If that fails, any host and any port are looked up in the netrc file
address@hidden/.authinfo.gpg}, which is a GnuPG encrypted file (@pxref{GnuPG
+and EasyPG Assistant Configuration}).
+
+Finally, the unencrypted netrc file @file{~/.netrc} will be used for
+any host and any port.
 
 The typical netrc line example is without a port.