Merge changes from emacs-23 branch

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

diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index 01e86fb..c2b6867 100644 (file)
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -5,11 +5,12 @@
 @c %**end of header
 
 @copying
-Copyright @copyright{} 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright @copyright{} 2006-2011
+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.2 or
+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'',
 and with the Back-Cover Texts as in (a) below.  A copy of the license is
@@ -21,9 +22,9 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
-* Rcirc: (rcirc).       Internet Relay Chat (IRC) client.
+* Rcirc: (rcirc).               Internet Relay Chat (IRC) client.
 @end direntry
 
 @titlepage
@@ -33,10 +34,11 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
+
 @ifnottex
 @node Top, Basics, (dir), (dir)
 @top rcirc Manual
-@end ifnottex
 
 @code{rcirc} is an Emacs IRC client.
 
@@ -45,6 +47,10 @@ communicate with each other in real-time.  Communication occurs both in
 topic channels which are collections of many users, or privately, with
 just one other user.
 
+@insertcopying
+
+@end ifnottex
+
 @menu
 * Basics::
 * Reference::
@@ -652,7 +658,7 @@ expected.
 
 @kindex C-c C-l
 @cindex low priority channels
-The solution is to mark this channel as as a low priority channel.
+The solution is to mark this channel as a low priority channel.
 Use @kbd{C-c C-l} to make the current channel a low-priority channel.
 Low priority channels have the modeline indicator ``LowPri''.
 @kbd{C-c C-@key{SPC}} will not switch to low priority channels unless
@@ -740,7 +746,7 @@ listed.  Example: @code{/keyword manual}.
 
 @node Notices, , Keywords, Fighting Information Overload
 @section Notices
-@cindex part notices, how to omit 
+@cindex part notices, how to omit
 @cindex join notices, how to omit
 @cindex quit notices, how to omit
 @cindex nick notices, how to omit
@@ -942,7 +948,3 @@ The real answer, therefore, is a @code{/reconnect} command:
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 2589e562-3843-4ffc-8c2f-477cbad57c01
-@end ignore