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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 320-323)

   - Update from CVS

2 files changed, 18 insertions, 8 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index c1e91ff9595..441c8fe4fa2 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -88,23 +88,26 @@ is encountered.
 
 ** Add missing years in copyright notices of all files.
 
+Policy document admin/notes/years must be updated before
+making further progress on this task!!!
+
 Please record your name here and say which part of the distribution
 you're going to handle.
 
 DIRECTORY               STATUS          IN CHARGE
 ---------               ------          ---------
 leim                    working         Kenichi Handa
-lisp/calc               done            Thien-Thi Nguyen
+lisp/calc               working         Thien-Thi Nguyen
 lisp/calendar           working         Glenn Morris
-lisp/emulation          done            Thien-Thi Nguyen
+lisp/emulation          working         Thien-Thi Nguyen
 lisp/eshell             working         Thien-Thi Nguyen
 lisp/international      done            Kenichi Handa
 lisp/languages          done            Kenichi Handa
-lisp/mh-e               done            Thien-Thi Nguyen
-lisp/net                done            Thien-Thi Nguyen
-lisp/play               done            Thien-Thi Nguyen
-lisp/term               done            Thien-Thi Nguyen
-lisp/toolbar            done            Thien-Thi Nguyen
+lisp/mh-e               working         Thien-Thi Nguyen
+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/url                working         Thien-Thi Nguyen
 
 ** Update AUTHORS.
@@ -132,7 +135,7 @@ man/commands.texi   "Luc Teirlinck"  Chong Yidong
 man/custom.texi     Chong Yidong
 man/dired.texi      Chong Yidong     joakim@verona.se
 man/display.texi    "Luc Teirlinck"  Chong Yidong
-man/emacs.texi      "Luc Teirlinck"
+man/emacs.texi      "Luc Teirlinck"  Lute Kamstra
 man/entering.texi   "Luc Teirlinck"  Chong Yidong
 man/files.texi      "Luc Teirlinck"  Chong Yidong
 man/fixit.texi      "Luc Teirlinck"  Chong Yidong
diff --git a/admin/notes/years b/admin/notes/years
index 72f217e925d..453712e4c02 100644
--- a/admin/notes/years
+++ b/admin/notes/years
@@ -1,3 +1,10 @@
+
+
+  THIS DOCUMENT IS UNDER REVIEW.
+
+  DO NOT FOLLOW THESE INSTRUCTIONS -- THEY ARE NOT CORRECT.
+
+
 How to Maintain Copyright Years for GNU Emacs