summaryrefslogtreecommitdiff
path: root/doc/misc
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-11-13 00:05:42 -0800
committerGlenn Morris <rgm@gnu.org>2012-11-13 00:05:42 -0800
commitf925b109e76f36081d9495252fcee204deb4c1fb (patch)
tree5ab1471e2065c6bcc919a50182fa0ce71defcbab /doc/misc
parentf99c65e5743526a7fcc6352599b6f0efd3970202 (diff)
downloademacs-f925b109e76f36081d9495252fcee204deb4c1fb.tar.gz
emacs-f925b109e76f36081d9495252fcee204deb4c1fb.tar.bz2
emacs-f925b109e76f36081d9495252fcee204deb4c1fb.zip
* doc/misc/erc.texi (Connecting): Add brief section on passwords.
* etc/NEWS: Related edit.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog1
-rw-r--r--doc/misc/erc.texi24
2 files changed, 25 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 82e0cd0f856..0a837320b43 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -2,6 +2,7 @@
* erc.texi (Modules): Undocument obsolete "hecomplete".
Add "notifications".
+ (Connecting): Add brief section on passwords.
2012-11-12 Glenn Morris <rgm@gnu.org>
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index b5c0dd3c718..ea315cd86fa 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -604,6 +604,30 @@ ERC should automatically attempt to connect with another nickname.
You can manually set another nickname with the /NICK command.
@end defopt
+@subheading Password
+@cindex password
+
+@defopt erc-prompt-for-password
+If non-@code{nil} (the default), @kbd{M-x erc} prompts for a password.
+@end defopt
+
+If you prefer, you can set this option to @code{nil} and use the
+@code{auth-source} 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:
+
+@example
+machine irc.example.net login "#fsf" password sEcReT
+@end example
+
+@noindent
+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