Merge from emacs--rel--22

[gnu-emacs] / admin / FOR-RELEASE

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 506fb31622cb3cb0f2eeed73596d798a818391fd..22e3b6539734eae7f2516c8c8cf1efbaee3fbfd5 100644 (file)
--- 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
@@ -43,14 +47,16 @@ GNU/Linux system.
 
 * BUGS
 
+NB the definitive copy of this file for Emacs 22 is on the
+EMACS_22_BASE branch.  Any entries below are automatically copied from
+that branch.  Do not make manual changes to this file on the trunk.
+
 ** ams@gnu.org, 9 July: eshell and external commands
 http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00385.html
 
 ** Check all non-file-scope static vars to make sure they
 won't lose on USG or HPUX systems.
 
-** davidk@lysator.liu.se, 21 Jun: display-buffer change.
-
 * FIXES FOR EMACS 22.3
 
 Here we list any small fixes that arrived too late for Emacs 22.2, but