Merged from emacs@sv.gnu.org.

Patches applied:

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-335
   Add note about "link" button-class to etc/TODO

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

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

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

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

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

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

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-348
   Update for ERC 5.1.3.

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

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

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-111
   Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

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

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

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

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

3 files changed, 76 insertions, 37 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 938f69d0250..7519bfcee90 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-09  Kim F. Storm  <storm@cua.dk>
+
+        * README: Use outline format.  Add FOR-RELEASE.
+
+2006-06-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * FOR-RELEASE: Checking of info.texi done.
+
 2006-06-08  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * FOR-RELEASE: Update refcard section.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 3d06efe7932..853fdc9d3bf 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -2,9 +2,6 @@ Tasks needed before the next release.
 
 * TO BE DONE SHORTLY BEFORE RELEASE
 
-** `undo-ask-before-discard', currently set to t for debugging purposes
-has to be set to nil: when t, it can leak memory and cause other problems.
-
 ** Update release dates of manuals.
 
 ** Get rid of overfull and underfull boxes in manuals.
@@ -12,9 +9,6 @@ has to be set to nil: when t, it can leak memory and cause other problems.
 ** Check for widow and orphan lines in manuals;
 make sure all the pages really look ok in the manual as formatted.
 
-** Update facemenu-unlisted-faces, adding whatever other
-face name prefixes should be in it for good results.
-
 ** Update AUTHORS.
 
 ** Regenerate the postscript files of the reference cards in etc.
@@ -39,17 +33,6 @@ and KDE projects, to use the new Emacs icons in etc/images/icons.
 
 * BUGS
 
-** text_property_stickiness can be called with a POS value that is before BEGV.
-
-text_property_stickiness is called from get_pos_property,
-which is called from find_field, which is called from
-various user-level functions in editfns.c.
-
-** JD Smith's 17 Apr 2006 bug report that CVS operations
-get mysterious unreproducible failures.
-
-** Is there a basic problem with cl-byte-compile-compiler-macro?
-
 ** Markus Gritsch's report about Emacs looping on Windoze with the following
 .emacs file, and then reduce Emacs frame width to "something quite narrow":
         (setq-default truncate-lines t)
@@ -76,8 +59,6 @@ It seems that to fix this, w32 server sockets must use WSAAsyncSelect
 
 * DOCUMENTATION
 
-** Check man/info.texi.
-
 ** Check the Emacs Lisp manual.
 
 Each manual section should be checked for factual correctness
@@ -98,7 +79,7 @@ lispref/compile.texi     "Luc Teirlinck"   Chong Yidong
 lispref/control.texi     "Luc Teirlinck"   Chong Yidong
 lispref/customize.texi   Chong Yidong      "Luc Teirlinck"
 lispref/debugging.texi   Joakim Verona <joakim@verona.se>   Lute Kamstra
-lispref/display.texi     Chong Yidong
+lispref/display.texi     Chong Yidong      Jason Rumney
 lispref/edebug.texi      Chong Yidong      "Luc Teirlinck"
 lispref/elisp.texi       "Luc Teirlinck"   Lute Kamstra
 lispref/errors.texi      "Luc Teirlinck"   Chong Yidong
@@ -114,7 +95,7 @@ lispref/intro.texi	 "Luc Teirlinck"   Josh Varner
 lispref/keymaps.texi     "Luc Teirlinck"   Chong Yidong
 lispref/lists.texi       "Luc Teirlinck"   Chong Yidong
 lispref/loading.texi     "Luc Teirlinck"   Chong Yidong
-lispref/locals.texi      Chong Yidong
+lispref/locals.texi      Chong Yidong      Nick Roberts
 lispref/macros.texi      "Luc Teirlinck"   Chong Yidong
 lispref/maps.texi        Chong Yidong
 lispref/markers.texi     "Luc Teirlinck"   Chong Yidong
@@ -152,7 +133,7 @@ SECTION                  READERS
 etc/TUTORIAL             rms
 etc/TUTORIAL.bg          Ognyan Kulev <ogi@fmi.uni-sofia.bg>
 etc/TUTORIAL.cn
-etc/TUTORIAL.cs          Pavel Janík <Pavel@Janik.cz>
+etc/TUTORIAL.cs          Pavel Janík <Pavel@Janik.cz>
 etc/TUTORIAL.de          Werner LEMBERG <wl@gnu.org>
 etc/TUTORIAL.es          Marcelo Toledo
 etc/TUTORIAL.fr          ttn
@@ -164,7 +145,7 @@ etc/TUTORIAL.pl          Slawomir Nowaczyk <slawek@cs.lth.se>
 etc/TUTORIAL.pt_BR       Marcelo Toledo
 etc/TUTORIAL.ro
 etc/TUTORIAL.ru          Alex Ott <alexott@gmail.com>
-etc/TUTORIAL.sk          Pavel Janík <Pavel@Janik.cz>
+etc/TUTORIAL.sk          Pavel Janík <Pavel@Janik.cz>
 etc/TUTORIAL.sl          Primoz PETERLIN <primoz.peterlin@biofiz.mf.uni-lj.si>
 etc/TUTORIAL.sv          Mats Lidell <matsl@contactor.se>
 etc/TUTORIAL.th          Virach Sornlertlamvanich <virach@tcllab.org>
diff --git a/admin/README b/admin/README
index e5116fcbaa3..008717bcee5 100644
--- a/admin/README
+++ b/admin/README
@@ -1,21 +1,71 @@
+                         The admin directory
+
 This directory contains scripts and other things useful for developing
 and maintaining Emacs.  These files are not part of Emacs releases
 because they are not deemed generally useful, and you have to know
 what you do when using them.
 
-Brief description of scripts found here:
-
-admin.el                utilities for setting version numbers and alike
-alloc-color.c           a utility program that allocates a given number of
-                        colors on X.  Can be used to debug Emacs with
-                        dense colormaps (PseudoColor).
-build-configs           build Emacs in various configurations
-check-doc-strings       check doc strings against documentation
-cus-test.el             tests for custom types and load problems
-diff-tar-files          show files added/removed between two tar files
-make-emacs              build Emacs in various ways
-make-tarball.txt        instructions to create pretest or release tarballs
-quick-install-emacs     install emacs quickly (`incrementally')
-revdiff                 get CVS diffs of files
+
+* Instructions and scripts used to prepare an Emacs release.
+
+** FOR-RELEASE
+
+Living list of activities that must be completed before the next release.
+
+** make-tarball.txt
+
+Instructions to create pretest or release tarballs, annoucements, etc.
+
+** admin.el
+
+Utilities for setting version numbers and alike.
+
+** make-announcement, make-changelog-diff
+
+Scripts used to prepare release announcements.
+
+
+* Scripts that can be used to build and test Emacs.
+
+** build-configs
+
+Build Emacs in various configurations.
+
+** make-emacs
+
+Build Emacs in various ways.
+
+** quick-install-emacs
+
+Install emacs quickly (`incrementally').
+
+** alloc-color.c
+
+A utility program that allocates a given number of colors on X.  Can
+be used to debug Emacs with dense colormaps (PseudoColor).
+
+** check-doc-strings
+
+Check doc strings against documentation.
+
+** cus-test.el
+
+Tests for custom types and load problems.
+
+** diff-tar-files
+
+Show files added/removed between two tar files.
+
+** revdiff
+
+Get CVS diffs of files.
+
+
+
+
+Local variables:
+mode: outline
+paragraph-separate: "[  ]*$"
+end:
 
 # arch-tag: 812b9461-bc0a-46a7-925e-24bd41118463