Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641)

Patches applied:

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-630
   Merge from gnus--rel--5.10

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

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

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-149
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-150
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-151
   Update from CVS

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

2 files changed, 10 insertions, 4 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index f5c6da45881..0f4438aa24c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-30  Chong Yidong  <cyd@stupidchicken.com>
+
+        * FOR-RELEASE: Init file change implemented.
+
 2005-10-27  Chong Yidong  <cyd@stupidchicken.com>
 
         * FOR-RELEASE: Fringe angle bitmap at eob fixed.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 967b0123c3f..93f0064b152 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -27,8 +27,6 @@ face name prefixes should be in it for good results.
 
 * NEW FEATURES
 
-** Change .emacs.d/.emacs to .emacs.d/emacs.
-
 ** Rework how fringe bitmaps are defined and used.
 Currently, bitmap usage and bitmap appearence are "mixed-up" in a
 one-level representation.  It would be cleaner to split the
@@ -46,7 +44,11 @@ invalid pointer from string_free_list.
 
 * BUGS
 
-** VC bug report from Peter Milliken on Sep 21 (emacs-pretest-bug).
+** Make where-is-internal detect when a key is shadowed by a shorter
+prefix key that prevents you from entering it.
+
+** Clean up the confusion about what `unspecified' means
+in the face defaults for new frames.
 
 ** TCP server processes do not work on Windows.
 
@@ -57,7 +59,7 @@ Seems to be a problem in sys_select in w32proc.c.
 
 * DOCUMENTATION
 
-** Update man/info.texi.
+** Check man/info.texi.
 
 ** Add missing years in copyright notices of all files.