summaryrefslogtreecommitdiff
path: root/etc/ERC-NEWS
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/ERC-NEWS
parentbd9bb96e15cb9c36523210260a6d863a1606eb89 (diff)
downloademacs-5b87ad554026d3e588ffe56f112f1e56b47b763b.tar.gz
Switch to standard GPL text for license.
Diffstat (limited to 'etc/ERC-NEWS')
-rw-r--r--etc/ERC-NEWS21
1 files changed, 19 insertions, 2 deletions
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 16b3d5eb161..dd5c113c195 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,8 +1,7 @@
ERC NEWS -*- outline -*-
Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-Copying and distribution of this file, with or without modification,
-are permitted provided the copyright notice and this notice are preserved.
+See the end of the file for license conditions.
* Changes in ERC 5.2 (stable pre-release for Emacs 22)
@@ -849,4 +848,22 @@ Same applies to timestamps. You no longer need to (require
'erc-stamp), you can customize the variable `erc-timestamp-mode', and
the rest should be automatic.
+
+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.
+
arch-tag: 2b21b387-6cdc-4192-889c-6743cfffdcb1