Update from erc--emacs--22

Highlights:
 - Remove contributions from someone who has not assigned changes yet.
 - Merge in a couple of bug-fixes from the main branch.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-546
Creator:  Michael Olson <mwolson@gnu.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 212da90ae1b..bfbcffd0784 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-08  Michael Olson  <mwolson@gnu.org>
+
+        * erc.texi (Modules): Remove documentation for list module.
+
 2006-12-06  Richard Stallman  <rms@gnu.org>
 
         * text.texi (Outline Format): Say to set outline-regexp
diff --git a/man/erc.texi b/man/erc.texi
index 0d535eae875..d8ae4157a47 100644
--- a/man/erc.texi
+++ b/man/erc.texi
@@ -422,10 +422,6 @@ Launch an identd server on port 8113
 @item irccontrols
 Highlight or remove IRC control characters
 
-@cindex modules, list
-@item list
-List channels nicely in a separate buffer
-
 @cindex modules, log
 @item log
 Save buffers in logs