From: Glenn Morris <rgm@gnu.org>
Date: Wed, 25 Jul 2007 06:51:03 +0000 (+0000)
Subject: Standardize license text and switch to GPLv3 or later.
X-Git-Tag: emacs-pretest-22.1.90~1191
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=80d1bbb3a6893a3ac76d7275d7fa7c610f8ce5a5;p=emacs.git

Standardize license text and switch to GPLv3 or later.
---

diff --git a/etc/grep.txt b/etc/grep.txt
index ed28c773904..b653f13cf67 100644
--- a/etc/grep.txt
+++ b/etc/grep.txt
@@ -91,8 +91,8 @@ COPYING PERMISSIONS:
 
     This document 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 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 3, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -100,8 +100,9 @@ COPYING PERMISSIONS:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.
 
 
 ;;; Local Variables: