X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/e983096bb6a50fdae6625cb363642bcd74ec39c5..536610a433e6edc0b3f831272c4e0424ebebee46:/doc/misc/erc.texi

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 95f9e4a20f..b46748a08f 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -2,42 +2,41 @@
 @c %**start of header
 @setfilename ../../info/erc
 @settitle ERC Manual
-@c %**end of header
-
-@dircategory Emacs
-@direntry
-* ERC: (erc).           Powerful, modular, and extensible IRC client for Emacs.
-@end direntry
-
 @syncodeindex fn cp
+@c %**end of header
 
 @copying
 This manual is for ERC version 5.3.
 
-Copyright @copyright{} 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright @copyright{} 2005-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, Front-Cover texts, or Back-Cover Texts.  A copy of
-the license is included in the section entitled ``GNU Free
-Documentation License'' in the Emacs 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''.
 
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
 
 All Emacs Lisp code contained in this document may be used, distributed,
 and modified without restriction.
 @end quotation
 @end copying
 
+@dircategory Emacs network features
+@direntry
+* ERC: (erc).                   Powerful and extensible IRC client for Emacs.
+@end direntry
+
 @titlepage
 @title ERC manual
 @subtitle a full-featured IRC client
-@subtitle for GNU Emacs and XEmacs
+@subtitle for Emacs and XEmacs
 
 @c The following two commands
 @c start the copyright page.
@@ -46,7 +45,6 @@ and modified without restriction.
 @insertcopying
 @end titlepage
 
-@c So the toc is printed at the start
 @contents
 
 @ifnottex
@@ -178,7 +176,7 @@ contribute to ERC development, it is highly recommended that you use
 git.
 
 If you are new to git, you might find this tutorial helpful:
-@uref{http://www.kernel.org/pub/software/scm/git/docs/tutorial.html}.
+@uref{http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html}.
 
 Downloading ERC with git and staying up-to-date involves the following
 steps.
@@ -700,7 +698,7 @@ Translate morse code in messages
 
 @end table
 
-@c PRE5_3: Document every option of every module in its own subnode
+@c PRE5_4: Document every option of every module in its own subnode
 
 
 @node Advanced Usage, Getting Help and Reporting Bugs, Modules, Top
@@ -933,7 +931,7 @@ stuff, to the current ERC buffer."
 @section Options
 @cindex options
 
-@c PRE5_3: (Node) Document every ERC option (module options go in
+@c PRE5_4: (Node) Document every ERC option (module options go in
 @c previous chapter)
 
 This section has not yet been written.  For now, the easiest way to
@@ -1063,7 +1061,3 @@ We switched to using git for our version control system.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: cf9cfaff-fc12-4297-ad15-ec2493002b1e
-@end ignore