Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm@gnu.org.

[bpt/emacs.git] / admin / README

diff --git a/admin/README b/admin/README
index 8efcfa3..4dd1705 100644 (file)
--- a/admin/README
+++ b/admin/README
@@ -1,5 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-  Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -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,18 +60,21 @@ 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:
 
+charsets               scripts for generating charset map files
+                       in ../etc/charsets
+unidata                        scripts for generating character property files
+                       in ../lisp/international
 
 \f
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -80,13 +82,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 \f
 Local variables:
 mode: outline
 paragraph-separate: "[         \f]*$"
 end:
 
-# arch-tag: 812b9461-bc0a-46a7-925e-24bd41118463