diff options
author | Glenn Morris <rgm@gnu.org> | 2007-02-11 01:18:25 +0000 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2007-02-11 01:18:25 +0000 |
commit | 5b87ad554026d3e588ffe56f112f1e56b47b763b (patch) | |
tree | 6186cc803f4ce50ae5b599b6ccc449d84ac2d62c /lispintro | |
parent | bd9bb96e15cb9c36523210260a6d863a1606eb89 (diff) | |
download | emacs-5b87ad554026d3e588ffe56f112f1e56b47b763b.tar.gz |
Switch to standard GPL text for license.
Diffstat (limited to 'lispintro')
-rw-r--r-- | lispintro/ChangeLog | 19 | ||||
-rw-r--r-- | lispintro/README | 21 |
2 files changed, 36 insertions, 4 deletions
diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog index 7d4fae9eba8..7000f1fca19 100644 --- a/lispintro/ChangeLog +++ b/lispintro/ChangeLog @@ -237,7 +237,22 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 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. + + 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: ee4f8e1f-e14c-4d2e-86de-4dd697e6f1c3 diff --git a/lispintro/README b/lispintro/README index 3aed4f1d8be..df8cdc5241e 100644 --- a/lispintro/README +++ b/lispintro/README @@ -1,7 +1,6 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 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. This directory contains the source of the "Introduction to Programming @@ -65,3 +64,21 @@ of the Texinfo file 'emacs-lisp-intro.texi'. Best Wishes! 2006 Oct 31 Robert J. Chassell, bob@gnu.org + + +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. |