(gnus-news-header-disclaimer, gnus-news-trailer): Switch

to standard GPL text for license.  Update copyright for years from
Emacs 21 to present (mainly adding 2001).  Text taken from Glenn
Morris' change to GNUS-NEWS in Emacs / v5-10.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index b4a5400..4802808 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-24  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-news.el (gnus-news-header-disclaimer, gnus-news-trailer): Switch
+       to standard GPL text for license.  Update copyright for years from
+       Emacs 21 to present (mainly adding 2001).  Text taken from Glenn
+       Morris' change to GNUS-NEWS in Emacs / v5-10.
+
 2007-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.texi, message.texi: Bump No Gnus version.

diff --git a/texi/gnus-news.el b/texi/gnus-news.el
index 3c25d99..96f8e54 100644 (file)
--- a/texi/gnus-news.el
+++ b/texi/gnus-news.el
@@ -27,34 +27,37 @@
 
 (defvar gnus-news-header-disclaimer
 "GNUS NEWS -- history of user-visible changes.
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
-See the end for copying conditions.
 
-Please send Gnus bug reports to bugs\@gnus.org.
-For older news, see Gnus info node \"New Features\".
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007 Free Software Foundation, Inc.
+See the end of the file for license conditions.
 
-")
+Please send Gnus bug reports to bugs@gnus.org.
+For older news, see Gnus info node \"New Features\".")
 
 (defvar gnus-news-trailer
 "\f
 * For older news, see Gnus info node \"New Features\".
 
 ----------------------------------------------------------------------
-Copyright information:
+\f
+This file is part of GNU Emacs.
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-   Permission is granted to anyone to make or distribute verbatim copies
-   of this document as received, in any medium, provided that the
-   copyright notice and this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
-   Permission is granted to distribute modified versions
-   of this document, or of portions of it,
-   under the above conditions, provided also that they
-   carry prominent notices stating who last changed them.
 \f\nLocal variables:\nmode: outline
 paragraph-separate: \"[        \f]*$\"\nend:\n")