Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-313
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-314
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-315
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-316
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-317
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-318
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-319
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-69
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-347

2 files changed, 53 insertions, 2 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index d159c711672..c1e91ff9595 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -94,12 +94,18 @@ you're going to handle.
 DIRECTORY               STATUS          IN CHARGE
 ---------               ------          ---------
 leim                    working         Kenichi Handa
-lisp/emulation          working         Thien-Thi Nguyen
+lisp/calc               done            Thien-Thi Nguyen
+lisp/calendar           working         Glenn Morris
+lisp/emulation          done            Thien-Thi Nguyen
+lisp/eshell             working         Thien-Thi Nguyen
 lisp/international      done            Kenichi Handa
 lisp/languages          done            Kenichi Handa
-lisp/net                working         Thien-Thi Nguyen
+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/url                working         Thien-Thi Nguyen
 
 ** Update AUTHORS.
 
diff --git a/admin/notes/years b/admin/notes/years
new file mode 100644
index 00000000000..72f217e925d
--- /dev/null
+++ b/admin/notes/years
@@ -0,0 +1,45 @@
+How to Maintain Copyright Years for GNU Emacs
+
+
+Principle: Individual files need to have the year of the release
+           in the copyright notice if there is significant change.
+
+
+Practice:
+
+- individual files
+  - each must be examined, along w/ its history, by a human
+  - automated tools facilitate but can never replace this process
+
+- year of the release
+  - may be different from year of file introduction,
+    or year of last significant change
+  - sometimes the release year slips, leaving a file w/ prematurely
+    marked release year => need update (e.g., s/2004/2005/ for Emacs 22)
+  - intervening years (between releases) are not valid and may cause
+    embarrassment later in case of dispute => remove (however, see next)
+  - years for new files (merged, contributed) that have been separately
+    published are valid even if between releases => leave alone
+
+- significant change
+  - insignificant
+    - whitespace
+    - copyright notice
+    - version control tags
+    - simple var/func renaming
+    - in-file reorganization/reordering
+    - typos
+    - small bugfixes
+    - small docfixes
+    - filename renaming
+  - most everything else is significant
+    - change to interface
+    - change in functionality
+    - new file
+  - many small changes may be significant in aggregate
+
+- when in doubt, ask (and update these guidelines -- thanks!)
+
+- sometimes people make mistakes
+  - if they have not read these guidelines, point them here
+  - if the guidelines are not helpful, improve the guidelines