Merge from emacs--devo--0

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

1 files changed, 6 insertions, 16 deletions

diff --git a/admin/notes/copyright b/admin/notes/copyright
index 4ab01feeae3..975caef3b30 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
-Copyright (C) 2007  Free Software Foundation, Inc.
+Copyright (C) 2007, 2008  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -405,7 +405,7 @@ lisp/term/README
 
   Accordingly, FSF copyright was added.
 
-src/unexhp9k800.c  (and dependent src/m/sr2k.h)
+src/unexhp9k800.c
   http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html
   - briefly removed due to legal uncertainly Jan-Mar 2007. The
   relevant assignment is under "hp9k800" in copyright.list. File was
@@ -480,7 +480,7 @@ says it is obsolete:
 
 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,
-isc2-2.h, netbsd.h, osf1.h, sol2-3.h, sunos4-0.h, usg5-4-2.h
+netbsd.h, sol2-3.h, usg5-4-2.h
   - all these (not obviously trivial) files were missing copyrights
   till Feb 2007, when FSF copyright was added. Matt Norwood advised:
 
@@ -515,16 +515,6 @@ pmax.h
   I would say started non-trivial (1993, jimb, heavily based
   on irix4-0.h). A few borderline non-tiny changes since.
 
-? isc2-2.h
- started trivial. 2 non-tiny change, in 1993. looks to
- be made up of several small tweaks from various sources. maybe
- non-tiny total changes from Karl Berry (no emacs assignment).
-
-osf1.h
-  started trivial. grown in tiny changes (one borderline tiny change
-  by fx in 2000, but most code was later removed). non-tiny addition
-  in 2002 from m/alpha.h, but that was and is copyright FSF.
-
 usg5-4-2.h
  started non-trivial, but was heavily based on usg5-4.h, which was and is
  copyright FSF. only tiny changes since installed.
@@ -533,7 +523,7 @@ sol2-3.h
  started trivial. only non-tiny change (1994) incorporated code from
  usg5-4.h, which was and is copyright FSF.
 
-aix3-2.h, bsd386.h, hpux8.h, hpux9.h, netbsd.h, sunos4-0.h
+aix3-2.h, bsd386.h, hpux8.h, hpux9.h, netbsd.h
   started trivial, grown in tiny changes.
 
 netbsd.h:
@@ -548,8 +538,8 @@ Someone might want to tweak the copyright years (for dates before
 Note: erring on the side of caution, I also added notices to some
 files I thought might be considered non-trivial (if one includes
 comment) in s/:
-  aix4-1.h hiuxmpp.h hiuxwe2.h hpux10.h irix6-0.h irix6-5.h isc3-0.h
-  ptx4.h sol2.h sunos4-0.h
+  aix4-1.h hpux10.h irix6-0.h irix6-5.h
+  ptx4.h sol2.h 
 
 (everything with > 30 non-blank lines, which at least is _some_ kind of
 system)