Switch to standard GPL text for license.

[bpt/emacs.git] / CONTRIBUTE

diff --git a/CONTRIBUTE b/CONTRIBUTE
index e1fb74c..0f7fe68 100644 (file)
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -1,3 +1,6 @@
+Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+See end for license conditions.
+
 
                        Contributing to Emacs
 
@@ -147,13 +150,13 @@ giving you write access to the CVS repository.
 
 Discussion about Emacs development takes place on emacs-devel@gnu.org.
 
-Bug reports for released versions are sent to emacs-bugs@gnu.org.
+Bug reports for released versions are sent to bug-gnu-emacs@gnu.org.
 
 Bug reports for development versions are sent to emacs-pretest-bug@gnu.org.
 
 You can subscribe to the mailing lists at savannah.gnu.org/projects/emacs.
 
-You can find the mailing lists archives at mail.gnu.org or gmane.org.
+You can find the mailing lists archives at lists.gnu.org or gmane.org.
 
 
 ** Document your changes.
@@ -183,19 +186,39 @@ 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.
 It's sufficient that *Emacs* was changed in those years (and it was!).
 
 ** For those files that have been added since then, we should add
-the year it was added to Emacs, and all subsequent years."
+the year it was added to Emacs, and all subsequent years.
 
 ** For the refcards under etc/, it's ok to simply use the latest year
 (typically in a `\def\year{YEAR}' expression) for the rendered copyright
 notice, while maintaining the full list of years in the copyright notice
 in the comments.
 
+
+\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 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.
 \f
 Local variables:
 mode: outline