diff etc/NEWS @ 75774:dc23aaa67696

Switch to standard GPL text for license.
author Glenn Morris <rgm@gnu.org>
date Sun, 11 Feb 2007 01:18:25 +0000
parents 4f39aeb27f75
children 62615657e69c
line wrap: on
line diff
--- a/etc/NEWS	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/NEWS	Sun Feb 11 01:18:25 2007 +0000
@@ -1,7 +1,8 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-06-04
+
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
           Free Software Foundation, Inc.
-See the end for copying conditions.
+See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
 If possible, use M-x report-emacs-bug.
@@ -5986,20 +5987,23 @@
 
 
 ----------------------------------------------------------------------
-Copyright information:
-
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-	  Free Software Foundation, Inc.
-
-   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.
-
-   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.
+This file is part of GNU Emacs.
+
+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.
+
+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.
+
 
 Local variables:
 mode: outline