Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de

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

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 33686fd79fd4bd8d26793e168f3d26030447225b..4cb5eaed60459e55065024350521d929f4696821 100644 (file)
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -4,18 +4,19 @@
 @settitle ERC Manual
 @syncodeindex fn cp
 @include emacsver.texi
 @settitle ERC Manual
 @syncodeindex fn cp
 @include emacsver.texi

+@documentencoding UTF-8

 @c %**end of header
 
 @copying
 This manual is for ERC as distributed with Emacs @value{EMACSVER}.
 
 @c %**end of header
 
 @copying
 This manual is for ERC as distributed with Emacs @value{EMACSVER}.
 

-Copyright @copyright{} 2005--2013 Free Software Foundation, Inc.
+Copyright @copyright{} 2005--2014 Free Software Foundation, Inc.

 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no

-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''

 and with the Back-Cover Texts as in (a) below.  A copy of the license
 is included in the section entitled ``GNU Free Documentation License''.
 
 and with the Back-Cover Texts as in (a) below.  A copy of the license
 is included in the section entitled ``GNU Free Documentation License''.
 


@@ -149,7 +150,7 @@ then a bunch of other messages that describe the current IRC server.
 
 @item Join the #emacs channel
 
 
 @item Join the #emacs channel
 

-In that buffer, type ``/join SPC #emacs'' and hit @kbd{RET}.  Depending
+In that buffer, type ``/join @key{SPC} #emacs'' and hit @kbd{RET}.  Depending

 on how you've set up ERC, either a new buffer for ``#emacs'' will be
 displayed, or a new buffer called ``#emacs'' will be created in the
 background.  If the latter, switch to the ``#emacs'' buffer.  You will
 on how you've set up ERC, either a new buffer for ``#emacs'' will be
 displayed, or a new buffer called ``#emacs'' will be created in the
 background.  If the latter, switch to the ``#emacs'' buffer.  You will


@@ -234,9 +235,8 @@ forwards.
 
 Different channels and servers may have different language encodings.
 
 
 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 Emacs at
-@email{emacs-devel@@gnu.org} if you are interested in helping with the
+multiple languages.  Please contact the Emacs developers
+if you are interested in helping with the

 translation effort.
 
 @item user scripting
 translation effort.
 
 @item user scripting


@@ -784,9 +784,9 @@ To report a bug in ERC, use @kbd{M-x report-emacs-bug}.
 @chapter History
 @cindex history, of ERC
 
 @chapter History
 @cindex history, of ERC
 

-ERC was originally written by Alexander L. Belikoff
-@email{abel@@bfr.co.il} and Sergey Berezin
-@email{sergey.berezin@@cs.cmu.edu}.  They stopped development around
+@c abel@@bfr.co.il, sergey.berezin@@cs.cmu.edu
+ERC was originally written by Alexander L. Belikoff and Sergey Berezin.
+They stopped development around

 December 1999.  Their last released version was ERC 2.0.
 
 P.S.: If one of the original developers of ERC reads this, we'd like to
 December 1999.  Their last released version was ERC 2.0.
 
 P.S.: If one of the original developers of ERC reads this, we'd like to


@@ -796,8 +796,9 @@ general.
 @itemize
 @item 2001
 
 @itemize
 @item 2001
 

-In June 2001, Mario Lang @email{mlang@@delysid.org} and Alex Schroeder
-@email{alex@@gnu.org} took over development and created a ERC Project at
+@c mlang@@delysid.org, alex@@gnu.org
+In June 2001, Mario Lang and Alex Schroeder
+took over development and created a ERC Project at

 @uref{http://sourceforge.net/projects/erc}.
 
 In reaction to a mail about the new ERC development effort, Sergey
 @uref{http://sourceforge.net/projects/erc}.
 
 In reaction to a mail about the new ERC development effort, Sergey


@@ -825,7 +826,8 @@ ERC 4.0 was released.
 
 @item 2005
 
 
 @item 2005
 

-ERC 5.0 was released.  Michael Olson @email{mwolson@@gnu.org} became
+@c mwolson@@gnu.org
+ERC 5.0 was released.  Michael Olson became

 the release manager and eventually the maintainer.
 
 After some discussion between him and the Emacs developers, it was
 the release manager and eventually the maintainer.
 
 After some discussion between him and the Emacs developers, it was