Switch to standard GPL text for license.

1 files changed, 18 insertions, 13 deletions

diff --git a/etc/MACHINES b/etc/MACHINES
index 0b55a6f3355..3323c0b98b5 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -2,7 +2,7 @@ Emacs machines list
 
 Copyright (C) 1989, 1990, 1992, 1993, 1998, 2001, 2002, 2003, 2004,
   2005, 2006, 2007  Free Software Foundation, Inc.
-See the end of the file for copying permissions.
+See the end of the file for license conditions.
 
 This is a list of the status of GNU Emacs on various machines and systems.
 
@@ -1501,17 +1501,22 @@ mode: indented-text
 fill-prefix: "  "
 End:
 
-COPYING PERMISSIONS:
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this file, to deal in the file without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the file, and to
-    permit persons to whom the file is furnished to do so, subject to
-    the following condition:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the file.
-
+
+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.
 
 arch-tag: 7d2e93c7-e982-40ec-9055-3cd064042473