Switch to standard GPL text for license.

[bpt/emacs.git] / etc / NEWS.1-17

diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index cb8e28d..a69ac83 100644 (file)
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1,6 +1,8 @@
 GNU Emacs NEWS -- history of user-visible changes.  26-Mar-1986
+
 Copyright (C) 1985, 1986, 2006, 2007  Free Software Foundation, Inc.
-See the end for copying conditions.
+See the end of the file for license conditions.
+
 
 This file is about changes in emacs versions 1 through 17.
 
@@ -2509,19 +2511,23 @@ Lisp programming changes
 
 \f
 ----------------------------------------------------------------------
-Copyright information:
+This file is part of GNU Emacs.
 
-Copyright (C) 1985, 1986, 2006, 2007  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
 Local variables:
 mode: text