Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-77

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 504-513)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: .cvsignore: Add `lock'.

 * gnus--rel--5.10  (patch 99-103)

   - Update from CVS

2 files changed, 23 insertions, 10 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index b701f2509e7..47fd2c4b00b 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -96,17 +96,18 @@ you're going to handle.
 DIRECTORY               STATUS          IN CHARGE
 ---------               ------          ---------
 leim                    working         Kenichi Handa
-lisp/calc               working         Thien-Thi Nguyen
+lisp/calc               done            Thien-Thi Nguyen
 lisp/calendar           working         Glenn Morris
-lisp/emulation          working         Thien-Thi Nguyen
-lisp/eshell             working         Thien-Thi Nguyen
+lisp/emulation          done            Thien-Thi Nguyen
+lisp/eshell             done            Thien-Thi Nguyen
 lisp/international      done            Kenichi Handa
 lisp/languages          done            Kenichi Handa
 lisp/mh-e               working         Bill Wohler
-lisp/net                working         Thien-Thi Nguyen
-lisp/play               working         Thien-Thi Nguyen
-lisp/term               working         Thien-Thi Nguyen
-lisp/toolbar            working         Thien-Thi Nguyen
+lisp/net                done            Thien-Thi Nguyen
+lisp/play               done            Thien-Thi Nguyen
+lisp/progmodes          done            Nick Roberts
+lisp/term               done            Thien-Thi Nguyen
+lisp/toolbar            done            Thien-Thi Nguyen
 lisp/url                working         Thien-Thi Nguyen
 
 ** Check the Emacs manual.
diff --git a/admin/notes/years b/admin/notes/years
index 453712e4c02..0434193db3e 100644
--- a/admin/notes/years
+++ b/admin/notes/years
@@ -1,11 +1,23 @@
+How to Maintain Copyright Years for GNU Emacs
 
 
-  THIS DOCUMENT IS UNDER REVIEW.
+"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!).
 
-  DO NOT FOLLOW THESE INSTRUCTIONS -- THEY ARE NOT CORRECT.
+ For those files that have been added since then, we should add
+ the year it was added to Emacs, and all subsequent years."
 
+ --RMS, 2005-07-13
 
-How to Maintain Copyright Years for GNU Emacs
+
+------------------------------------------------------------------------------
+
+
+Following is the policy that we tried to write down one time (mid 2005).
+Although it is incorrect, we keep it around to remind us how complicated
+things used to be (and may become in the future).
 
 
 Principle: Individual files need to have the year of the release