aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2012-11-12 19:40:44 -0800
committerGlenn Morris2012-11-12 19:40:44 -0800
commit6e5e9b70f501a975baa4bce0b8f0854052435ff0 (patch)
tree19a4afa24240877198d2fef0b31e57fc0fbae14a /doc
parent314654db9bdf937d4fc9b770e688a42acb9a0514 (diff)
downloademacs-6e5e9b70f501a975baa4bce0b8f0854052435ff0.tar.gz
emacs-6e5e9b70f501a975baa4bce0b8f0854052435ff0.zip
Document new erc module "notifications"
* doc/misc/erc.texi (Modules): Undocument obsolete "hecomplete". Add "notifications". * lisp/erc/erc.el (erc-modules): Add "notifications". Tweak "hecomplete" doc. * etc/NEWS: Related edit.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/erc.texi10
2 files changed, 10 insertions, 5 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b3b4ad07147..82e0cd0f856 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12012-11-13 Glenn Morris <rgm@gnu.org>
2
3 * erc.texi (Modules): Undocument obsolete "hecomplete".
4 Add "notifications".
5
12012-11-12 Glenn Morris <rgm@gnu.org> 62012-11-12 Glenn Morris <rgm@gnu.org>
2 7
3 * flymake.texi (Customizable variables) 8 * flymake.texi (Customizable variables)
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 378180bef31..b5c0dd3c718 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -390,11 +390,6 @@ Complete nicknames and commands (programmable)
390@item fill 390@item fill
391Wrap long lines 391Wrap long lines
392 392
393@cindex modules, hecomplete
394@item hecomplete
395Complete nicknames and commands (old). This is the old module---you
396might prefer the ``completion'' module instead.
397
398@cindex modules, identd 393@cindex modules, identd
399@item identd 394@item identd
400Launch an identd server on port 8113 395Launch an identd server on port 8113
@@ -427,6 +422,11 @@ Don't display non-IRC commands after evaluation
427@item notify 422@item notify
428Notify when the online status of certain users changes 423Notify when the online status of certain users changes
429 424
425@cindex modules, notifications
426@item notifications
427Send you a notification when you get a private message,
428or your nickname is mentioned
429
430@cindex modules, page 430@cindex modules, page
431@item page 431@item page
432Process CTCP PAGE requests from IRC 432Process CTCP PAGE requests from IRC