2 files changed, 20 insertions, 16 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 3a1dda7124a..d6584f61a9e 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -22,6 +22,10 @@ sk	Miroslav Vaško        No response
 
 Reminders sent out on 2006-06-08.
 
+** Remove temporary +++/--- lines in NEWS.
+
+** Try to reorder NEWS: most important things first, related items together.
+
 * WINDOWS SUPPORT BUGS.
 
 These don't need to be fixed before a release, but we call the
@@ -49,12 +53,12 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00732.html
 ** michael.ewe@arcor.de, Apr 24: 22.0.98  not starting on Solaris 10/I386
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
 
-** rgm@gnu.org, Apr 24: [Stephen.Berman@gmx.net: Re: redisplay]
-  Gives test case for problem that a dialog box blocks redisplay.
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00951.html
+** Takaaki.Ota@am.sony.com, May 2: table cell menu does not appear at the menubar
+   Bug is intermittent.
+
+** Install vc-hooks.el patch from trunk.
 
-** C mode fontification took 50 seconds
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01460.html
+** Move some items from magic-mode-alist to file-start-mode-alist.
 
 * DOCUMENTATION
 
diff --git a/admin/notes/copyright b/admin/notes/copyright
index ce8953993de..6c9a7382c33 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -228,6 +228,7 @@ lisp/play/tetris.el
   the concept.
   rms: "My understanding is that game rules as such are not copyrightable."
   <http://lists.gnu.org/archive/html/emacs-devel/2007-01/msg00960.html>
+  rms: Legal advice is that we are ok and need not worry about this.
 
 lispref/doclicense.texi
 man/doclicense.texi
@@ -405,6 +406,7 @@ lisp/term/README
   Accordingly, FSF copyright was added.
 
 src/unexhp9k800.c  (and dependent src/m/sr2k.h)
+  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
   written by John V. Morris at HP, and disclaimed by the author and
@@ -425,6 +427,14 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00257.html
 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
+
+On consultation with a lawyer, we found there was no problem:
+http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg00466.html
+
+
 ** Issues that are "fixed" for the release of Emacs 22, but we may
    wish to revisit later in more detail
 
@@ -549,9 +559,6 @@ system)
     Emacs 22 is released (though if they can be fixed before, that is
     obviously good):
 
-Maybe some relevant comments here?
-<http://groups.google.com/group/linux.debian.legal/browse_thread/thread/123547ea95437a1f>
-
 
 Is it OK to just `cvs remove' a file for legal reasons, or is
 something more drastic needed? A removed file is still available from
@@ -586,16 +593,9 @@ etc/TUTORIAL* (translations)
 Done: TUTORIAL.eo
 
 
-REMOVED src/unexhp9k800.c
-  - we would like to re-add this file if possible. Please let us know
-  if you can clarify its legal status.
-  http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html
-
-
 *** These are copyright issues still to be addressed:
 
-python.el potential legal problem
-http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
+None known.