Changes from arch/CVS synchronization

1 files changed, 18 insertions, 61 deletions

diff --git a/admin/notes/copyright b/admin/notes/copyright
index 63947d75df0..036efa6f006 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -15,26 +15,19 @@ longer, eg the text "GNU Emacs is free software...".
 
 Summary for the impatient:
 
-1. Don't add code to Emacs written by someone other than yourself
-without thinking about the legal aspect. Even if the changes are
-trivial, consider if they combine with previous changes by the same
-author to make a non-trivial total. If so, make sure they have an
-assignment. If adding a whole file adjust the copyright statements in
-the file.
-
-2. When installing code written by someone else, the ChangeLog entry
-should be in the name of the author of the code, not the person who
-installs it. I think it is helpful to put the author (if not yourself)
-in the CVS log as well; and to not install any of your own changes in
-the same commit.
-
-3. With images, add the legal info to a README file in the directory
+1. Don't add a file to Emacs written by someone other than yourself
+without thinking about the legal aspect (make sure they have an
+assignment, adjust the copyright statements in the file). NB the
+ChangeLog entry should be in the name of the author of the code, not
+the person who installs it.
+
+2. With images, add the legal info to a README file in the directory
 containing the image.
 
-4. If you add a lot of text to a previously trivial file that had no
+3. If you add a lot of text to a previously trivial file that had no
 legal notices, consider if you should add a copyright statement.
 
-5. Please don't just add an FSF copyright without checking that is the
+4. Please don't just add an FSF copyright without checking that is the
 right thing to do.
 
 
@@ -140,15 +133,11 @@ lispintro/install-sh
 src/m/news-r6.h
   public domain, leave alone.
 
-etc/BABYL, ms-kermit
-  no notices (see below).
-
 etc/edt-user.doc
   - update BOTH notices in this file
 
 etc/emacs.csh
- - written by Michael DeCorte, who has no assignment. But trivial
- enough to not need license.
+  - keep simple license for this simple file
 
 etc/future-bug
  - doesn't need a humourless disclaimer, because Karl Fogel says we
@@ -170,12 +159,6 @@ WHY-FREE
   licenses that they have. They are distributed with Emacs but they
   are not part of Emacs."
 
-etc/HELLO
-  standard notices. Just a note that although the file itself is not
-  really copyrightable, in the wider context of it being part of
-  Emacs (and written by those with assignments), a standard notice is
-  fine.
-
 etc/MAILINGLISTS
   rms: simple license is fine for this file
 
@@ -378,20 +361,6 @@ src/acldef.h, chpdef.h, ndir.h
 
 ** Some notes on resolved issues, for historical information only
 
-etc/TERMS
-rms: "surely written either by me or by ESR. (If you can figure out
-which year, I can probably tell you which.) Either way, we have papers
-for it." Present in Emacs-16.56 (15-jul-85).
-
-etc/ulimit.hack
-  Very obsolete file removed March 2007. Doesn't say who the author
-is, but web-search suggests Karl Kleinpaste, who has no Emacs
-assignment. Trivial anyway.
-http://groups.google.com/group/comp.unix.shell/browse_thread/thread/bf3df496994\
-9f1df/7e5922c67b3a98fb
-http://groups.google.com/group/comp.unix.questions/msg/cc7e49cacfd1ccb4
-    (original 1987 source)
-
 lisp/term/README
   - had no copyright notice till Feb 2007. ChangeLog.3 suggests it was
   written by Eric Raymond. When asked by rms on 14 Feb 2007 he said:
@@ -412,16 +381,11 @@ lisp/term/README
 admin/check-doc-strings
   File says it's in the public domain, but that might not make it so.
 
-etc/BABYL
-  File written long ago by authors with no assignment. Keep them
-  without notices for now, try and contact authors if possible. Be
-  ready to remove these files if the authors ever object.
 
-etc/ms-kermit
 etc/e/eterm-color.ti
 src/acldef.h, chpdef.h, ndir.h
   On legal advice from Matt Norwood, the following comment was added
-  to these files in Feb/Mar 2007:
+  to these files in Feb 2007:
 
     The code here is forced by the interface, and is not subject to
     copyright, constituting the only possible expression of the
@@ -432,19 +396,6 @@ src/acldef.h, chpdef.h, ndir.h
   and possibly add a list of all authors who have changed these files.
   (details in email from Matt Norwood to rms, 2007/02/03).
 
-etc/ms-7bkermit
-  Says it was written by Andy Lowry and Joel Spolsky. No entry for
-either in copyright.list. NB this file is not "constrained" like
-ms-kermit (rms: "We know it isn't. A comment at the front says it has
-other bindings which might be handy."). File removed March 2007.
-Re-add if clear up status at some point.
-
-etc/Xkeymap.txt
-  No info on author. File removed March 2007. rms: "It says it is
-RLK's way of remapping his keyboard, so it is not constrained. I think
-it was written by RLK. Let's delete it; if we contact RLK again, we
-can put it back."
-
 
 src/m/mips4.h, news-risc.h, pmax.h
 src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h,
@@ -542,6 +493,11 @@ Make sure that all files with non-standard copyrights or licenses are
 noted in this file.
 
 
+etc/BABYL
+  File says it was written in 1983 by Eugene Ciccarelli, who has no
+  assignment. RMS: "The lawyer said we can keep BABYL."
+
+
 REMOVED etc/gnu.xpm, nt/icons/emacs21.ico, nt/icons/sink.ico
   - Restore if find legal info. emacs21.ico is not due to Davenport.
   Voelker could not immediately recall anything, but will check and
@@ -572,7 +528,8 @@ REMOVED src/unexhp9k800.c
 
 *** These are copyright issues still to be addressed:
 
-Do we need an assignment from Kevin Rodgers? (rms)
+
+etc/ms-kermit - no copyright, but ms-7bkermit has one