Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / doc / misc / erc.texi

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index beb8d545586ebe580fb24a3d595fcb5c089a2e3a..cc61cd1ab5b939543f04fe7674d4cc928b96f70a 100644 (file)
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -747,7 +747,7 @@ If non, @code{nil}, this is a list of IRC message types to hide, e.g.:
 @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.
+nickname is considered a lurker.
 @end defopt