Merge from emacs-24; up to 2013-01-01T11:02:14Z!rudalics@gmx.at

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

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 2a66396df67e44bfe2b3f2408c70029bd8f834fe..abf0766ee8f63b1696b2240d128bc6d484c55adb 100644 (file)
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -234,7 +234,6 @@ forwards.
 
 Different channels and servers may have different language encodings.
 
-In addition, it is possible to translate the messages that ERC uses into
 multiple languages.  Please contact the Emacs developers
 if you are interested in helping with the
 translation effort.
@@ -747,7 +746,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