Merge chagnes made in Gnus trunk.

[gnu-emacs] / README

diff --git a/README b/README
index 6bd1a9cbaed505de5f695a5f1dd5cd3e661dd80f..4897deb348f3a65800f360162358ec3c03da89d0 100644 (file)
--- a/README
+++ b/README
@@ -1,9 +1,8 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-  Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.

 See the end of the file for license conditions.
 
 
 See the end of the file for license conditions.
 
 

-This directory tree holds version 23.0.93 of GNU Emacs, the extensible,
+This directory tree holds version 24.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
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU


@@ -19,10 +18,8 @@ occur in building, installing and running Emacs.
 You may encounter bugs in this release.  If you do, please report
 them; your bug reports are valuable contributions to the FSF, since
 they allow us to notice and fix problems on machines we don't have, or
 You may encounter bugs in this release.  If you do, please report
 them; your bug reports are valuable contributions to the FSF, since
 they allow us to notice and fix problems on machines we don't have, or

-in code we don't use often.  Please send bug reports for released
-versions of Emacs sent to the mailing list bug-gnu-emacs@gnu.org.
-Please send bug reports for pretest versions of Emacs, and versions
-from the Savannah.gnu.org repository, to emacs-pretest-bug@gnu.org.
+in code we don't use often.  Please send bug reports to the mailing
+list bug-gnu-emacs@gnu.org.  If possible, use M-x report-emacs-bug.

 
 See the "Bugs" section of the Emacs manual for more information on how
 to report bugs.  (The file `BUGS' in this directory explains how you
 
 See the "Bugs" section of the Emacs manual for more information on how
 to report bugs.  (The file `BUGS' in this directory explains how you


@@ -65,18 +62,18 @@ There are several subdirectories:
 `leim'      holds the library of Emacs input methods, Lisp code and
             auxiliary data files required to type international characters
             which can't be directly produced by your keyboard.
 `leim'      holds the library of Emacs input methods, Lisp code and
             auxiliary data files required to type international characters
             which can't be directly produced by your keyboard.

+`lib'       holds source code for libraries used by Emacs and its utilities

 `lib-src'   holds the source code for some utility programs for use by or
             with Emacs, like movemail and etags.
 `lib-src'   holds the source code for some utility programs for use by or
             with Emacs, like movemail and etags.

-`etc'       holds miscellaneous architecture-independent data files
-            Emacs uses, like the tutorial text and the Zippy the Pinhead
-            quote database.  The contents of the `lisp', `leim', `info',
-            `man', `lispref', and `lispintro' subdirectories are
-            architecture-independent too.
+`etc'       holds miscellaneous architecture-independent data files Emacs
+            uses, like the tutorial text and tool bar images.
+            The contents of the `lisp', `leim', `info', and `doc'
+            subdirectories are architecture-independent too.

 `info'      holds the Info documentation tree for Emacs.
 `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
 `info'      holds the Info documentation tree for Emacs.
 `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.
+            package; you need a suitably recent version of Texinfo.

 `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.
 `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.


@@ -87,10 +84,17 @@ There are several subdirectories:
             to building and running Emacs on Windows 9X/ME/NT/2000/XP.
 `test'      holds tests for various aspects of Emacs's functionality.
 
             to building and running Emacs on Windows 9X/ME/NT/2000/XP.
 `test'      holds tests for various aspects of Emacs's functionality.
 

-   Building Emacs on non-Posix platforms requires to install tools
-that aren't part of the standard distribution of the OS.  The
-platform-specific README files and installation instructions should
-list the required tools.
+   Building Emacs on non-Posix platforms requires tools that aren't part
+of the standard distribution of the OS.  The platform-specific README
+files and installation instructions should list the required tools.
+
+\f
+NOTE ON COPYRIGHT YEARS
+
+In copyright notices where the copyright holder is the Free Software
+Foundation, then where a range of years appears, this is an inclusive
+range that applies to every year in the range.  For example: 2005-2008
+represents the years 2005, 2006, 2007, and 2008.

 
 \f
 This file is part of GNU Emacs.
 
 \f
 This file is part of GNU Emacs.