2 files changed, 17 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0a837320b43..1ec8a3d56ff 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -3,6 +3,7 @@
         * erc.texi (Modules): Undocument obsolete "hecomplete".
         Add "notifications".
         (Connecting): Add brief section on passwords.
+        (Options): Make a start by adding erc-hide-list, erc-lurker-hide-list.
 
 2012-11-12  Glenn Morris  <rgm@gnu.org>
 
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index ea315cd86fa..4be94df4b45 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -737,10 +737,24 @@ stuff, to the current ERC buffer."
 @c PRE5_4: (Node) Document every ERC option (module options go in
 @c previous chapter)
 
-This section has not yet been written.  For now, the easiest way to
-check out the available options for ERC is to do
+This section is extremely incomplete.  For now, the easiest way to
+check out all the available options for ERC is to do
 @kbd{M-x customize-group erc RET}.
 
+@defopt erc-hide-list
+If non, @code{nil}, this is a list of IRC message types to hide, e.g.
+
+@example
+(setq erc-hide-list '("JOIN" "PART" "QUIT"))
+@end example
+@end defopt
+
+@defopt erc-lurker-hide-list
+Like @code{erc-hide-list}, but only applies to messages sent by
+lurkers.  The function @code{erc-lurker-p} determines whether a given
+nickname is considerd a lurker.
+@end defopt
+
 
 @node Getting Help and Reporting Bugs
 @chapter Getting Help and Reporting Bugs