Switch to standard GPL text for license.

1 files changed, 21 insertions, 2 deletions

diff --git a/CONTRIBUTE b/CONTRIBUTE
index 97af1c44418..0f7fe6855b5 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -1,6 +1,5 @@
 Copyright (C) 2006, 2007  Free Software Foundation, Inc.
-Copying and distribution of this file, with or without modification,
-are permitted provided the copyright notice and this notice are preserved.
+See end for license conditions.
 
 
                         Contributing to Emacs
@@ -187,6 +186,8 @@ The file etc/DEBUG describes how to debug Emacs bugs.
 
 * How to Maintain Copyright Years for GNU Emacs
 
+See admin/notes/copyright.
+
 ** Our lawyer says it is ok if we add, to each file that has been in Emacs
 since Emacs 21 came out in 2001, all the subsequent years.  We don't
 need to check whether *that file* was changed in those years.
@@ -200,6 +201,24 @@ the year it was added to Emacs, and all subsequent years.
 notice, while maintaining the full list of years in the copyright notice
 in the comments.
 
+
+
+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.
 
 Local variables:
 mode: outline