Merge from gnus--devo--0

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

diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index 4fde4dc14142607dcd2e8803e4c413f6b23d0664..9642c3c1dd6e221419e67d4a0f53323720732ee0 100644 (file)
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -10,26 +10,20 @@
 @copying
 This file documents Ebrowse, a C++ class browser for GNU Emacs.
 
-Copyright @copyright{} 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007  Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009  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 included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-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.
+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''.
+
+(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.''
 @end quotation
 @end copying
 
@@ -49,11 +43,15 @@ license to the document, as described in section 6 of the license.
 @insertcopying
 @end titlepage
 
-@node Top, Overview, (dir), (dir)
+@contents
 
 @ifnottex
+@node Top, Overview, (dir), (dir)
+
 You can browse C++ class hierarchies from within Emacs by using
 Ebrowse.
+
+@insertcopying
 @end ifnottex
 
 @menu
@@ -1454,7 +1452,6 @@ in on with the command @kbd{C-c C-m m}.
 @unnumbered Concept Index
 @printindex cp
 
-@contents
 @bye
 
 @ignore