From 5b87ad554026d3e588ffe56f112f1e56b47b763b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 11 Feb 2007 01:18:25 +0000 Subject: Switch to standard GPL text for license. --- etc/README | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'etc/README') diff --git a/etc/README b/etc/README index af2f612d84d..e332216911f 100644 --- a/etc/README +++ b/etc/README @@ -1,3 +1,8 @@ +Copyright (C) 1992, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Free Software Foundation, Inc. +See the end of the file for license conditions. + + This directory contains the architecture-independent files used by or with Emacs. This includes some text files of documentation for GNU Emacs or of interest to Emacs users, and the file of dumped docstrings @@ -24,19 +29,20 @@ Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm, gnus-logo.eps Free Software Foundation, Inc. License: GNU General Public License version 2 or later (see COPYING) - -Copyright (C) 1992, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -Free Software Foundation, Inc. - -COPYING PERMISSIONS: - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this file, to deal in the file without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the file, and to - permit persons to whom the file is furnished to do so, subject to - the following condition: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the file. +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. -- cgit v1.2.1