From: Glenn Morris Date: Wed, 27 Feb 2008 05:03:06 +0000 (+0000) Subject: (auto-insert-alist): Change permission text to match FSF's GPLv3 form. X-Git-Tag: emacs-pretest-23.0.90~7634 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=88ddede6eee21ccb4da9cfec1e0e47356b7ab44b;p=emacs.git (auto-insert-alist): Change permission text to match FSF's GPLv3 form. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b36e66f8f0e..e4ab2ba690f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-02-27 Glenn Morris + * autoinsert.el (auto-insert-alist): Change permission text to + match FSF's GPLv3 form. + * mail/supercite.el (sc-cite-original): Doc fix. (sc-version): Make obsolete. (sc-describe): Show the SC info page. Make obsolete. diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index e7dc061168e..04c59441047 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -186,20 +186,18 @@ If this contains a %s, that will be replaced by the matching rule." (completing-read "Keyword, C-h: " v1 nil t)) str ", ") & -2 " -\;; This file is free software; you can redistribute it and/or modify +\;; This program 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 3, or (at your option) -\;; any later version. +\;; the Free Software Foundation, either version 3 of the License, or +\;; (at your option) any later version. -\;; This file is distributed in the hope that it will be useful, +\;; This program 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. +\;; along with this program. If not, see . \;;; Commentary: