Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 698-710)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 216)

   - Update from CVS

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

2 files changed, 32 insertions, 9 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index b03b1e8aea1..90ca44fbc5b 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -5,8 +5,6 @@ Tasks needed before the next release.
 ** Check for widow and orphan lines in manuals;
 make sure all the pages really look ok in the manual as formatted.
 
-** Cleanup temporary +++/--- lines in etc/NEWS.
-
 ** Regenerate the postscript files of the reference cards in etc.
 
 ** Ask maintainers of refcard translations to update them.
@@ -24,9 +22,6 @@ sk	Miroslav Vaško        No response
 
 Reminders sent out on 2006-06-08.
 
-** Send an email to the various distributions, including the GNOME
-and KDE projects, to use the new Emacs icons in etc/images/icons.
-
 * WINDOWS SUPPORT BUGS.
 
 These don't need to be fixed before a release, but we call the
@@ -41,9 +36,19 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
 * BUGS
 
-** spurious scrolling bug
+** python.el legal problem?
+http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
+
+** rcyeske@gmail.com, April 22: Failure to build on OpenBSD macppc.
+OpenBSD compilation works on i386.
+
+** bojohan+news@dd.chalmers.se, April 23: delete-overlay causes recentering
+(This is now the same as the spurious scrolling bug.)
+
+** finish fixing locate.el
 
-** crash in gc_sweep
+** angeli@caeruleus.net, April 23: Excessive refontification when setting
+        jit-lock-context-unfontify-pos
 
 * DOCUMENTATION
 
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 9fddd4f63b9..d7f12bd8ad4 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -306,6 +306,13 @@ originally. Although we have the legal right to switch to v2 or later,
 rms prefers that we do not do so.
 
 
+man/*.texi - All manuals should be under GFDL, and should include a
+copy of it, so that they can be distributed separately.  faq.texi has
+a different license, for some reason no-one can remember.
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00583.html
+http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00618.html
+
+
 msdos/is_exec.c, sigaction.c - these files are copyright DJ Delorie.
 Leave the copyrights alone. Leave the Eli Zaretskii copyright in
 is_exec.c alone. See the msdos/README file for the legal history of
@@ -404,6 +411,17 @@ src/unexhp9k800.c  (and dependent src/m/sr2k.h)
   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
+
+
 ** Issues that are "fixed" for the release of Emacs 22, but we may
    wish to revisit later in more detail
 
@@ -545,8 +563,8 @@ noted in this file.
 
 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
-  let us know if he finds anything.
+  Geoff Voelker checked but could not find a record of where it came
+  from.
 
 
 etc/images