summaryrefslogtreecommitdiff
path: root/etc/NEWS.21
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2007-02-11 01:18:25 +0000
committerGlenn Morris <rgm@gnu.org>2007-02-11 01:18:25 +0000
commit5b87ad554026d3e588ffe56f112f1e56b47b763b (patch)
tree6186cc803f4ce50ae5b599b6ccc449d84ac2d62c /etc/NEWS.21
parentbd9bb96e15cb9c36523210260a6d863a1606eb89 (diff)
downloademacs-5b87ad554026d3e588ffe56f112f1e56b47b763b.tar.gz
Switch to standard GPL text for license.
Diffstat (limited to 'etc/NEWS.21')
-rw-r--r--etc/NEWS.2131
1 files changed, 18 insertions, 13 deletions
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 5c8c9d1d655..476853746f5 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -1,7 +1,9 @@
GNU Emacs NEWS -- history of user-visible changes. 2006-05-31
+
Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- Free Software Foundation, Inc.
-See the end for copying conditions.
+ Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
This file is about changes in emacs version 21.
@@ -4879,20 +4881,23 @@ support a vertical-bar cursor).
----------------------------------------------------------------------
-Copyright information:
+This file is part of GNU Emacs.
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 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.
Local variables:
mode: outline