Merge from emacs--rel--22

[gnu-emacs] / admin / README

diff --git a/admin/README b/admin/README
index 8efcfa3224a15b3a9b81ccb1f668ead313392aa6..c6d0c02cde334d86ebb9819bbb91b58320ac9ba2 100644 (file)
--- a/admin/README
+++ b/admin/README
@@ -1,4 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

   Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
   Free Software Foundation, Inc.
 See the end of the file for license conditions.
 


@@ -66,13 +66,20 @@ Show files added/removed between two tar files.
 Get CVS diffs of files.
 
 
 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.
 
 \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
 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
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -80,9 +87,7 @@ 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
 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
 \f
 Local variables:
 mode: outline