Optionally, undo several consequential deletion in one step.

[bpt/emacs.git] / doc / misc / erc.texi

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 2a66396..96bfc1e 100644 (file)
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -1,21 +1,22 @@
 \input texinfo
 @c %**start of header
-@setfilename ../../info/erc
+@setfilename ../../info/erc.info
 @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}.
 
-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
-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''.
 
@@ -149,7 +150,7 @@ then a bunch of other messages that describe the current IRC server.
 
 @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
@@ -234,7 +235,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 +747,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