summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXue Fuqiao <xfq.free@gmail.com>2013-05-28 09:05:41 +0800
committerXue Fuqiao <xfq.free@gmail.com>2013-05-28 09:05:41 +0800
commit962e44a5425bf7bda8c853c0e6acf5c0e7440af9 (patch)
treee713e30ebd604d0ad2c4b64081483e7166f8a0a5
parent3a52ccf7c2effeba40fb15950495ccdf8e32ef12 (diff)
downloademacs-962e44a5425bf7bda8c853c0e6acf5c0e7440af9.tar.gz
* erc.texi (Special Features): ERC is being maintained within Emacs
now. (See http://lists.gnu.org/archive/html/erc-discuss/2012-10/msg00000.html)
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/erc.texi6
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e74926ea25c..8ee12718980 100644
--- 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 cc61cd1ab5b..33686fd79fd 100644
--- 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