Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-486
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-487
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-488
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-489
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-156
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-157
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-158
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-159
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-160
   Update from CVS

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

2 files changed, 5 insertions, 3 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ea3016b07ee..f31e58bab9c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * make-announcement (OLD): Remove LEIM references in announcement
+        since it is now built-in.
+
 2006-10-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * admin.el (set-version): Set version numbers in "mac" subdirectory.
diff --git a/admin/make-announcement b/admin/make-announcement
index dd55efe360b..992808a514d 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -34,18 +34,15 @@ cat <<EOF
 There is a new pretest available in
 
   <ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$NEW.tar.gz>
-  <ftp://alpha.gnu.org/gnu/emacs/pretest/leim-$NEW.tar.gz>
 
 Please report results from compiling and running the pretest to
 <emacs-pretest-bug@gnu.org>.  Your feedback is necessary for us
 to know on which platforms the pretest has been tried.
-Please say whether you built with LEIM or not.
 
 If you have the tars from the previous pretest, and you have the
 \`xdelta' utility, you can instead download the much smaller
 
   <ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$OLD-$NEW.xdelta>
-  <ftp://alpha.gnu.org/gnu/emacs/pretest/leim-$OLD-$NEW.xdelta>
 
 You can use a command like