[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110861: * doc/misc/erc.texi (Connecting): Add brief section on passwords.

[Glenn Morris]

------------------------------------------------------------
revno: 110861
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-11-13 00:05:42 -0800
message:
  * doc/misc/erc.texi (Connecting): Add brief section on passwords.
  
  * etc/NEWS: Related edit.
modified:
  doc/misc/ChangeLog
  doc/misc/erc.texi
  etc/NEWS

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-11-13 03:40:44 +0000
+++ b/doc/misc/ChangeLog        2012-11-13 08:05:42 +0000
@@ -2,6 +2,7 @@
 
        * erc.texi (Modules): Undocument obsolete "hecomplete".
        Add "notifications".
+       (Connecting): Add brief section on passwords.
 
 2012-11-12  Glenn Morris  <address@hidden>
 

=== modified file 'doc/misc/erc.texi'
--- a/doc/misc/erc.texi 2012-11-13 03:40:44 +0000
+++ b/doc/misc/erc.texi 2012-11-13 08:05:42 +0000
@@ -604,6 +604,30 @@
 You can manually set another nickname with the /NICK command.
 @end defopt
 
address@hidden Password
address@hidden password
+
address@hidden erc-prompt-for-password
+If address@hidden (the default), @kbd{M-x erc} prompts for a password.
address@hidden defopt
+
+If you prefer, you can set this option to @code{nil} and use the
address@hidden mechanism to store your password.  For instance, if
+you use @file{~/.authinfo} as your auth-source backend, then put
+something like the following in that file:
+
address@hidden
+machine irc.example.net login "#fsf" password sEcReT
address@hidden example
+
address@hidden
+ERC also consults @code{auth-source} to find any channel keys required
+for the channels that you wish to autojoin, as specified by the
+variable @code{erc-autojoin-channels-alist}.
+
+For more details, @pxref{Top,,auth-source, auth, Emacs auth-source Library}.
+
+
 @subheading Full name
 
 @defun erc-compute-full-name &optional full-name

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-11-13 03:40:44 +0000
+++ b/etc/NEWS  2012-11-13 08:05:42 +0000
@@ -438,9 +438,12 @@
 *** New module "notifications", which can send a notification when you
 receive a private message or your nickname is mentioned.
 
++++
 *** ERC will look up server/channel names via auth-source and use any
 channel keys found.
 
+*** FIXME erc-lurker-hide-list
+
 +++
 ** Flymake uses fringe bitmaps to indicate errors and warnings.
 See `flymake-fringe-indicator-position', `flymake-error-bitmap' and