diff CONTRIBUTE @ 83556:07774e5c3ff5

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-619 Update from CVS * [e-mail]/emacs--devo--0--patch-620 Update from CVS * [e-mail]/emacs--devo--0--patch-621 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-622 Update from CVS * [e-mail]/emacs--devo--0--patch-623 Remove RCS keywords * [e-mail]/emacs--devo--0--patch-624 Update from CVS * [e-mail]/emacs--devo--0--patch-625 Update from CVS * [e-mail]/emacs--devo--0--patch-626 Update from CVS * [e-mail]/emacs--devo--0--patch-627 Update from CVS * [e-mail]/emacs--devo--0--patch-628 Update from CVS * [e-mail]/emacs--devo--0--patch-629 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-630 Update from CVS * [e-mail]/emacs--devo--0--patch-631 Update from CVS * [e-mail]/emacs--devo--0--patch-632 Update from CVS * [e-mail]/emacs--devo--0--patch-633 Update from CVS * [e-mail]/emacs--devo--0--patch-634 Update from CVS * [e-mail]/emacs--devo--0--patch-635 Update from CVS * [e-mail]/emacs--devo--0--patch-636 Update from CVS * [e-mail]/emacs--devo--0--patch-637 Remove RCS keywords * [e-mail]/emacs--devo--0--patch-638 Update from CVS * [e-mail]/emacs--devo--0--patch-639 Update from CVS * [e-mail]/emacs--devo--0--patch-640 Update from CVS * [e-mail]/emacs--devo--0--patch-641 Update from CVS * [e-mail]/emacs--devo--0--patch-642 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-643 Update from CVS * [e-mail]/emacs--devo--0--patch-644 Update from CVS * [e-mail]/emacs--devo--0--patch-645 Update from CVS * [e-mail]/emacs--devo--0--patch-646 Update from CVS * [e-mail]/emacs--devo--0--patch-647 Update from CVS * [e-mail]/emacs--devo--0--patch-648 Update from CVS * [e-mail]/emacs--devo--0--patch-649 Update from CVS * [e-mail]/gnus--rel--5.10--patch-197 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-198 Update from CVS * [e-mail]/gnus--rel--5.10--patch-199 Update from CVS * [e-mail]/gnus--rel--5.10--patch-200 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-201 Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser. * [e-mail]/gnus--rel--5.10--patch-202 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-596

--- a/CONTRIBUTE	Sat Feb 24 19:12:27 2007 +0000
+++ b/CONTRIBUTE	Sat Feb 24 19:26:54 2007 +0000
@@ -1,3 +1,6 @@
+Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+See end for license conditions.
+
 
 			Contributing to Emacs
 
@@ -183,6 +186,8 @@
 
 * 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.
@@ -196,6 +201,24 @@
 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