Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-427
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-428
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-429
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-430
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-431
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-432
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-433
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-434
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-435
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-436
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-204

2 files changed, 33 insertions, 5 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 56bdd5d83ee..b164f414a88 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * FOR-RELEASE: Removed entry about GTK and monochrome displays (done).
+
 2002-06-26  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * FOR-RELEASE: Moved here from the etc directory.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 2bf27858bcc..2d5738a8683 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -1,8 +1,6 @@
 Tasks needed before the next release.
 
-** Test the mbox branch of Rmail.
-
-** Install the mbox branch of Rmail.
+* DOCUMENTATION
 
 ** Finish updating the Emacs Lisp manual.
 
@@ -16,9 +14,35 @@ Tasks needed before the next release.
 
 ** Update man/info.texi.
 
+
+* NEW FEATURES
+
+** Test the mbox branch of Rmail.
+
+** Install the mbox branch of Rmail.
+
+** Update Gnus.
+
+** Face remapping.
+
+
+* FATAL ERRORS
+
+** Investigate face cache related crash.
+
+Indications: Face cache seems to have been cleared, but
+redisplay uses an invalidated face_id with FACE_FROM_ID
+which then returns a NULL pointer.  Said to happen with
+isearch faces.
+
+
+* GTK RELATED BUGS
+
 ** Make geometry specifications work correctly for GTK.
 
 ** Make GTK scrollbars behave like others w.r.t. overscrolling.
 
-** Make GTK toolbar look OK on monochrome displays.
-
+
+Local variables:
+mode: outline
+end: