Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 866-879)

   - Merge multi-tty branch
   - Update from CVS
   - Merge from emacs--rel--22

Revision: [email protected]/emacs--unicode--0--patch-257

1 files changed, 5 insertions, 6 deletions

diff --git a/README b/README
index 59e509355b..61970c946b 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 See the end of the file for license conditions.
 
 
-This directory tree holds version 22.1.50 of GNU Emacs, the extensible,
+This directory tree holds version 23.0.50 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU
@@ -73,14 +73,13 @@ There are several subdirectories:
             `man', `lispref', and `lispintro' subdirectories are
             architecture-independent too.
 `info'      holds the Info documentation tree for Emacs.
-`man'       holds the source code for the Emacs Manual.  If you modify the
+`doc/emacs' holds the source code for the Emacs Manual.  If you modify the
             manual sources, you will need the `makeinfo' program to produce
             an updated manual.  `makeinfo' is part of the GNU Texinfo
             package; you need version 4.6 or later of Texinfo.
-`lispref'   holds the source code for the Emacs Lisp reference manual.
-`lispintro' holds the source code for the Introduction to Programming
-            in Emacs Lisp manual.
-
+`doc/lispref'   holds the source code for the Emacs Lisp reference manual.
+`doc/lispintro' holds the source code for the Introduction to Programming
+                in Emacs Lisp manual.
 `msdos'     holds configuration files for compiling Emacs under MSDOG.
 `vms'       holds instructions and useful files for running Emacs under VMS.
 `nt'        holds various command files and documentation files that pertain