Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 343-356)

   - Update from CVS
   - Update for ERC 5.1.3.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 113-115)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90

3 files changed, 86 insertions, 44 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 4684e6e5d5e..51c8fa9100b 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,15 @@
+2006-07-17  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* FOR-RELEASE: Update refcard section.
+
+2006-07-14  Kim F. Storm  <storm@cua.dk>
+
+	* FOR-RELEASE (BUGS): High cpu load on windows server sockets fixed.
+
+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.
@@ -52,7 +64,7 @@
 
 2006-01-27  Chong Yidong  <cyd@stupidchicken.com>
 
-	* FOR-RELEASE: string allocation bugs fixed.
+	* FOR-RELEASE: String allocation bugs fixed.
 
 2005-12-13  Bill Wohler  <wohler@newt.com>
 
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index fb172a99a63..4ad5eb2cf12 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -2,13 +2,8 @@ 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.
-
 ** Check for widow and orphan lines in manuals;
 make sure all the pages really look ok in the manual as formatted.
 
@@ -21,12 +16,12 @@ make sure all the pages really look ok in the manual as formatted.
 Requests to have been sent out on 2006-05-23 (Reiner Steib).
 
 LANG	Translator            Status
-cs	Pavel Janík           No response
+cs	Pavel Janík           Can't work on it now.
 de	Sven Joachim          Done
 fr	Eric Jacoboni         Done        (layout might be improved)
 pl	Włodek Bzyl           Done
 pt-br	Rodrigo Real          Done
-ru	Alex Ott              Working
+ru	Alex Ott              Done
 sk	Miroslav Vaško        No response
 
 Reminders sent out on 2006-06-08.
@@ -36,8 +31,6 @@ and KDE projects, to use the new Emacs icons in etc/images/icons.
 
 * BUGS
 
-** Stephen.Berman@gmx.net: isearch-yank-line and field text property
-
 ** 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)
@@ -46,20 +39,7 @@ and KDE projects, to use the new Emacs icons in etc/images/icons.
 	 '(hscroll-step 1)
 	)
 
-** TCP server processes do not work on Windows.
-
-TCP/IP server processes created with `make-network-process' consume
-excesive CPU on some Windows environments.  Usages of 50% and 100%
-CPU time have been observed on different Window XP configurations.
-Seems to be a problem in sys_select in w32proc.c.
-
-In its current form, it sys_select says the socket is ready, so we
-call server_accept_connection which again calls accept() which returns
--1 with errno == WSAEWOULDBLOCK (10035) indicating that there is no
-pending connection to accept.
-
-It seems that to fix this, w32 server sockets must use WSAAsyncSelect
-+ FD_ACCEPT to request notifications of incoming connections...
+** David Kastrup's report on strange scrolling of large images.
 
 
 * DOCUMENTATION
@@ -74,17 +54,17 @@ people who have checked it.
 SECTION                  READERS
 ----------------------------------
 lispref/abbrevs.texi     "Luc Teirlinck"   Chong Yidong
-lispref/advice.texi	 joakim@verona.se  Chong Yidong
-lispref/anti.texi        Chong Yidong
+lispref/advice.texi      Joakim Verona     Chong Yidong
+lispref/anti.texi        Chong Yidong      Kim F. Storm
 lispref/backups.texi     "Luc Teirlinck"   Chong Yidong
 lispref/buffers.texi     "Luc Teirlinck"   Chong Yidong
-lispref/calendar.texi    Joakim Verona <joakim@verona.se>  Chong Yidong
+lispref/calendar.texi    Joakim Verona     Chong Yidong
 lispref/commands.texi    "Luc Teirlinck"   Chong Yidong
 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/debugging.texi   Joakim Verona     Lute Kamstra
+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
@@ -102,7 +82,7 @@ lispref/lists.texi	 "Luc Teirlinck"   Chong Yidong
 lispref/loading.texi     "Luc Teirlinck"   Chong Yidong
 lispref/locals.texi      Chong Yidong      Nick Roberts
 lispref/macros.texi      "Luc Teirlinck"   Chong Yidong
-lispref/maps.texi        Chong Yidong
+lispref/maps.texi        Chong Yidong	   Kim F. Storm
 lispref/markers.texi     "Luc Teirlinck"   Chong Yidong
 lispref/minibuf.texi     "Luc Teirlinck"   Chong Yidong
 lispref/modes.texi	 Chong Yidong
diff --git a/admin/README b/admin/README
index 3ead9902843..2540ccc73c1 100644
--- a/admin/README
+++ b/admin/README
@@ -1,22 +1,72 @@
+			 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:
 
 Brief description of sub-directories: