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

1 files changed, 64 insertions, 14 deletions

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: