Merge from emacs-24; up to 2014-07-27T01:00:26Z!fgallina@gnu.org

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

diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index e76172017a8fbb1c6a323612d47c5902a95e05eb..e37db1997569d45db33bb163db47f56adb2b4111 100644 (file)
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -1,19 +1,18 @@
 \input texinfo
 @c %**start of header
-@setfilename ../../info/rcirc
+@setfilename ../../info/rcirc.info
 @settitle rcirc Manual
 @documentencoding UTF-8
-@documentlanguage en
 @c %**end of header
 
 @copying
-Copyright @copyright{} 2006--2013 Free Software Foundation, Inc.
+Copyright @copyright{} 2006--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''.
 
@@ -213,7 +212,7 @@ Emacs, or join @code{#rcirc}, the channel about @code{rcirc}.
 
 @cindex server buffer
 When you have answered these questions, @code{rcirc} will create a server
-buffer, which will be named something like @code{*irc.freenode.net*},
+buffer, which will be named something like @file{*irc.freenode.net*},
 and a channel buffer for each of the channels you wanted to join.
 
 @kindex RET