Merge from trunk

2 files changed, 24 insertions, 99 deletions

diff --git a/admin/notes/bzr b/admin/notes/bzr
index db9e6e0dcda..5600c9badb0 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -65,23 +65,22 @@ removes a file, then remove the corresponding files by hand.
 The following description uses bound branches, presumably it works in
 a similar way with unbound ones.
 
-0) (First time only) Get the bzr changelog_merge plugin:
+0) (First time only) Get the bzr changelog_merge plugin
+(this will be included by default in bzr 2.4 onwards):
 
 cd ~/.bazaar/plugins
-bzr branch lp:bzr-changelog-merge
+# The following is an improved version of: lp:bzr-changelog-merge
+bzr branch lp:~spiv/bzr-changelog-merge/non-head-edits-723968
 mv bzr-changelog-merge changelog_merge
 
-This will make merging ChangeLogs a lot smoother.  It merges new
-entries to the top of the file, rather than trying to fit them in
-mid-way through.
+This should make merging ChangeLogs smoother.  It merges new entries
+to the top of the file, rather than trying to fit them in mid-way
+through.  Newer versions of the plugin should also be able to deal
+with changes to *old* ChangeLog entries, that should not be floated to
+the head of the file (see launchpad#723968).
 
-Sigh.  This plugin has a drawback.  People often like to edit older
-ChangeLog entries, not at the head of the file.  Frequently they do
-this in the same commit as making new entries.  Using this plugin
-will merge ALL changed entries (including older ones) to the top of
-the destination file.
-
-Maybe the default Emacs behavior without this plugin is better, I dunno.
+Maybe the default Emacs behavior without this plugin is better,
+though, it's not clear yet.
 
 1) Get clean, up-to-date copies of the emacs-23 and trunk branches.
 Check for any uncommitted changes with bzr status.
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 54d97adaf1c..39eb003a07d 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -120,7 +120,10 @@ or even ChangeLogs, for older changes. People often installed changes
 from others, without recording the true authorship.
 
 [For reference, most of these points were established via email with
-rms, 2007/1, "Copyright years".]
+rms, 2007/1, "Copyright years".
+
+In March 2011, information on some files no longer included was removed.
+Consult older versions of this document if interested.]
 
 
 lisp/version.el           # emacs-copyright
@@ -143,20 +146,9 @@ lib/Makefile.in
 install-sh
  - this file is copyright MIT, which is OK. Leave the copyright alone.
 
-mkinstalldirs
-src/m/news-r6.h
-  public domain, leave alone.
-
 etc/refcards/*.tex
   also update the \def\year macro for the latest year.
 
-etc/BABYL, ms-kermit
-  no notices (see below).
-
-etc/emacs.csh
- - written by Michael DeCorte, who has no assignment. But trivial
- enough to not need license.
-
 etc/future-bug
  - doesn't need a humorless disclaimer, because Karl Fogel says we
  can consider it part of Emacs, and he has a blanker disclaimer for
@@ -389,9 +381,9 @@ Makefile.in does now.
 src/gmalloc.c
   - contains numerous copyrights from the GNU C library. Leave them alone.
 
-src/acldef.h, chpdef.h, ndir.h
-  - see comments below. These files are OK to be released with Emacs
-  22, but we may want to revisit them afterwards.
+src/ndir.h
+  - see comments below. This file is OK to be released with Emacs
+  22, but we may want to revisit it afterwards.
 
 
 ** Some notes on resolved issues, for historical information only
@@ -402,15 +394,6 @@ which year, I can probably tell you which.) Either way, we have papers
 for it." It was present in Emacs-16.56 (15-jul-85). rms: "Then I
 conclude it was written by me."
 
-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:
@@ -431,20 +414,6 @@ src/unexhp9k800.c
   HP. So this file is public domain.
 
 
-K Rodgers changes
- It was pointed out that K Rodgers only had assigments for VC and
- ps-print, but had changed several other files. We tried to contact
- him for a general assignment, but he proved uncommunicative (despite
- initially indicating to rms he would sign an assignment). As a result, his
- changes were removed and/or rewritten independently. For details, see
- threads:
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00225.html
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00257.html
-
- But then an assignment arrived before the release of Emacs 22:
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01427.html
-
-
 lisp/progmodes/python.el
 Dave Love alerted us to a potential legal problem:
 http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
@@ -460,14 +429,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg00466.html
 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
+src/ndir.h
   On legal advice from Matt Norwood, the following comment was added
   to these files in Feb/Mar 2007:
 
@@ -480,25 +443,8 @@ 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." Actually, RLK == Robert Krawitz has an Emacs
-assignment. So this could be restored if it is still useful, but Jan Djärv
-says it is obsolete:
-<http://lists.gnu.org/archive/html/emacs-devel/2007-03/msg00673.html>
-
-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,
-netbsd.h, sol2-3.h, usg5-4-2.h
+src/s/aix3-2.h, hpux8.h, hpux9.h, irix5-0.h, netbsd.h, usg5-4-2.h
+  [note some of these have since been merged into other files]
   - all these (not obviously trivial) files were missing copyrights
   till Feb 2007, when FSF copyright was added. Matt Norwood advised:
 
@@ -513,22 +459,6 @@ netbsd.h, sol2-3.h, usg5-4-2.h
 
 Here is my (rgm) take on the details of the above files:
 
-mips4.h
-  might be trivial? started trivial, been added to in tiny changes by
-  those with FSF assignment, often result of email suggestions by others.
-
-news-risc.h
-  started trivial. Grown by tiny additions, plus chunk
-  from mips.h, which was and is Copyright FSF
-
-pmax.h
-  started trivial. grown in tiny changes, except for maybe Jim Wilson's
-  comment.
-
-? irix4-0.h
-  I would say started non-trivial (1992, rms). only tiny changes since
-  installed.
-
 ? irix5-0.h
   I would say started non-trivial (1993, jimb, heavily based
   on irix4-0.h). A few borderline non-tiny changes since.
@@ -537,11 +467,7 @@ 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.
 
-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
+aix3-2.h, hpux8.h, hpux9.h, netbsd.h
   started trivial, grown in tiny changes.
 
 netbsd.h:
@@ -556,8 +482,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 hpux10.h irix6-0.h irix6-5.h
-  ptx4.h sol2.h
+  aix4-1.h hpux10.h irix6-5.h
+  sol2.h
 
 (everything with > 30 non-blank lines, which at least is _some_ kind of
 system)