Switch to standard GPL text for license.

1 files changed, 21 insertions, 5 deletions

diff --git a/etc/DISTRIB b/etc/DISTRIB
index 414e35e426e..33bc767df79 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -4,12 +4,11 @@ the USA, see http://www.gnu.org/order/order.html.
 
 	   GNU Emacs availability information, October 2000
 
-Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995,
+  1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
 
-	Permission is granted to anyone to make or distribute
-	verbatim copies of this document provided that the
-	copyright notice and this permission notice are preserved.
 
 GNU Emacs is legally owned by the Free Software Foundation, but we
 regard the foundation more as its custodian on behalf of the public.
@@ -97,3 +96,20 @@ above).
 			Richard M Stallman
 			Chief GNUisance,
 			President of the Free Software Foundation
+
+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.