Revert previous change - merge mistake.

diff --git a/etc/README b/etc/README
dissimilarity index 64%
index 16e0923..e18da7f 100644 (file)
--- a/etc/README
+++ b/etc/README
@@ -1,44 +1,17 @@
-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
-for Emacs functions and variables.
-
-
-`termcap.src' is included mainly for VMS.  It is a copy of the
-`/etc/termcap' file used on Unix.
-
-
-COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
-
-The files splash.xpm, splash8.xpm contain copyright and license
-information, but it is reproduced here for convenience.
-
-Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm, gnus-logo.eps
-  Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-    Free Software Foundation, Inc.
-  License: GNU General Public License version 3 or later (see COPYING)
-
-File: emacs.icon
-  Author: Sun Microsystems, Inc
-  Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-    Free Software Foundation, Inc.
-  License: GNU General Public License version 3 or later (see COPYING)
-
-\f
-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 3, 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.
+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
+for Emacs functions and variables.
+
+
+`termcap.src' is included mainly for VMS.  It is a copy of the
+`/etc/termcap' file used on Unix.
+
+
+COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
+
+File: emacs.icon
+  Author: Sun Microsystems, Inc
+  Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+    Free Software Foundation, Inc.
+  License: GNU General Public License version 3 or later (see COPYING)