Merge from trunk

[gnu-emacs] / admin / README

diff --git a/admin/README b/admin/README
index c6d0c02cde334d86ebb9819bbb91b58320ac9ba2..b5eefc2da7a6c2c300229eae482be93f1ff16db5 100644 (file)
--- a/admin/README
+++ b/admin/README
@@ -1,5 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-  Free Software Foundation, Inc.
+Copyright (C) 2001-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -19,7 +18,7 @@ Living list of activities that must be completed before the next release.
 
 ** make-tarball.txt
 
-Instructions to create pretest or release tarballs, annoucements, etc.
+Instructions to create pretest or release tarballs, announcements, etc.
 
 ** admin.el
 
@@ -44,7 +43,7 @@ Build Emacs in various ways.
 
 Install emacs quickly (`incrementally').
 
-** alloc-color.c
+** alloc-colors.c
 
 A utility program that allocates a given number of colors on X.  Can
 be used to debug Emacs with dense colormaps (PseudoColor).
@@ -61,10 +60,6 @@ Tests for custom types and load problems.
 
 Show files added/removed between two tar files.
 
-** revdiff
-
-Get CVS diffs of files.
-
 
 Brief description of sub-directories:
 
@@ -93,5 +88,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[         \f]*$"
 end:
-
-# arch-tag: 812b9461-bc0a-46a7-925e-24bd41118463