Merge from emacs-24; up to 2012-12-03T21:07:47Z!eggert@cs.ucla.edu

[gnu-emacs] / etc / grep.txt

diff --git a/etc/grep.txt b/etc/grep.txt
index 8acfc4fc6447beca45d160c725ccd662de0f0add..e9fea92e304e4aaf2c7df5dfff63998f42dcfa5e 100644 (file)
--- a/etc/grep.txt
+++ b/etc/grep.txt
@@ -1,4 +1,4 @@
-* Introduction  -*-grep-*-
+* Introduction  -*-grep-*-     (See the end of file for copyright information)
 
 This shows the different kinds of messages grep recognizes by default and
 how they are rendered.  It is intended both to help you decide which matchers
@@ -82,6 +82,27 @@ grep -nH -e "xyzxyz" ../info/*
 ../info/emacs-2 1205.10-1205.15 inserts `xyzxyzxyzxyz' in the current buffer.
 ../info/emacs-2 1205 inserts `xyzxyzxyzxyz' in the current buffer.
 
+\f
+
+Copyright (C) 2005-2012  Free Software Foundation, Inc.
+
+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 3 of the License, 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
+    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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
 ;;; Local Variables:
+;;; eval: (let ((inhibit-read-only t) (compilation-filter-start (point-min))) (save-excursion (goto-char (point-max)) (grep-filter) (set-buffer-modified-p nil)))
 ;;; buffer-read-only: t
 ;;; End: