Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162

1 files changed, 21 insertions, 1 deletions

diff --git a/admin/notes/years b/admin/notes/years
index 155ccd6f065..b5e93f1406a 100644
--- a/admin/notes/years
+++ b/admin/notes/years
@@ -2,7 +2,7 @@ How to Maintain Copyright Years for GNU Emacs
 
 
 "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
+ since Emacs 21 came out in 2001, all the subsequent years[1].  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!).
 
@@ -11,6 +11,9 @@ How to Maintain Copyright Years for GNU Emacs
 
  --RMS, 2005-07-13
 
+[1] Note that this includes 2001 - see
+<http://lists.gnu.org/archive/html/emacs-pretest-bug/2006-12/msg00119.html>
+
 
 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
@@ -18,6 +21,23 @@ notice, while maintaining the full list of years in the copyright notice
 in the comments.
 
 
+Please fix or report any non-trivial files that have "odd" copyright
+notices.  This includes missing copyright notices, and copyright
+holders other than FSF (or AIST in some cases).  In most cases,
+individual authors should not appear in copyright statements.  Either
+the copyright has been assigned (check copyright.list) to the FSF (in
+which case the original author should be removed and the year(s)
+transferred to the FSF); or else it is possible the file should not be
+in Emacs at all (please report!).
+
+When updating the copyright in a file (eg a .tex file) that generates
+another file distributed with Emacs, don't forget to check in a
+regenerated version of the target file.
+
+For auto-generated files (eg ldefs-boot.el), RMS says (20061211,
+private mail): "Since they are automatically generated, it doesn't
+really matter what they say."
+
 ------------------------------------------------------------------------------