Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 615-621)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 197-199)

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

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

1 files changed, 1 insertions, 19 deletions

diff --git a/admin/notes/years b/admin/notes/years
index b5e93f1406a..fe08fa9640a 100644
--- a/admin/notes/years
+++ b/admin/notes/years
@@ -1,5 +1,5 @@
 How to Maintain Copyright Years for GNU Emacs
-
+  (see also file "copyright" in this directory)
 
 "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[1].  We don't
@@ -20,24 +20,6 @@ For the refcards under etc/, it's ok to simply use the latest year
 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."
-
 ------------------------------------------------------------------------------