* erc.texi (Special Features): ERC is being maintained within Emacs

now.  (See
http://lists.gnu.org/archive/html/erc-discuss/2012-10/msg00000.html)

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e74926ea25c202fe77957da2df65173da7fde12a..8ee127189802caba94d24a521ed68c709579c0be 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-28  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * erc.texi (Special Features): ERC is being maintained within
+       Emacs now.
+
 2013-05-25  Xue Fuqiao  <xfq.free@gmail.com>
 
        * flymake.texi: Changing from one space between sentences to two.

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index cc61cd1ab5b939543f04fe7674d4cc928b96f70a..33686fd79fd4bd8d26793e168f3d26030447225b 100644 (file)
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -234,9 +234,9 @@ 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 developers of ERC at
-@email{erc-discuss@@gnu.org} if you are interested in helping with the
+In addition, it is possible to translate the messages that ERC uses
+into multiple languages.  Please contact the developers of Emacs at
+@email{emacs-devel@@gnu.org} if you are interested in helping with the
 translation effort.
 
 @item user scripting