[Emacs-diffs] /srv/bzr/emacs/trunk r112750: * erc.texi (Special Features): ERC is being maintained within Emacs

[Xue Fuqiao]

------------------------------------------------------------
revno: 112750
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Tue 2013-05-28 09:05:41 +0800
message:
  * erc.texi (Special Features): ERC is being maintained within Emacs
  now.  (See
  http://lists.gnu.org/archive/html/erc-discuss/2012-10/msg00000.html)
modified:
  doc/misc/ChangeLog
  doc/misc/erc.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-05-25 01:26:12 +0000
+++ b/doc/misc/ChangeLog        2013-05-28 01:05:41 +0000
@@ -1,3 +1,8 @@
+2013-05-28  Xue Fuqiao  <address@hidden>
+
+       * erc.texi (Special Features): ERC is being maintained within
+       Emacs now.
+
 2013-05-25  Xue Fuqiao  <address@hidden>
 
        * flymake.texi: Changing from one space between sentences to two.

=== modified file 'doc/misc/erc.texi'
--- a/doc/misc/erc.texi 2013-01-02 16:13:04 +0000
+++ b/doc/misc/erc.texi 2013-05-28 01:05:41 +0000
@@ -234,9 +234,9 @@
 
 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
address@hidden@@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
address@hidden@@gnu.org} if you are interested in helping with the
 translation effort.
 
 @item user scripting