Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org

[gnu-emacs] / msdos / README

diff --git a/msdos/README b/msdos/README
index 4f5f7448a1bb9417aee59094e9fec26b711b3178..6e7c872ff3fc04f9f3015fe04171b0915f06bd54 100644 (file)
--- a/msdos/README
+++ b/msdos/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.
 
 
 See the end of the file for license conditions.
 
 


@@ -11,8 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on
 Windows 3.X.  Since these are binary files, their copyright notice is
 reproduced here:
 
 Windows 3.X.  Since these are binary files, their copyright notice is
 reproduced here:
 

-# Copyright (C) 1993, 2002, 2003, 2004, 2005,
-#   2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1993, 2002-2012  Free Software Foundation, Inc.

 #
 # This file is part of GNU Emacs.
 #
 #
 # This file is part of GNU Emacs.
 #


@@ -62,7 +60,7 @@ This document is Copyright (C) DJ Delorie and may be distributed
 verbatim, but changing it is not allowed.
 
 Source code copyright DJ Delorie is distributed under the terms of the
 verbatim, but changing it is not allowed.
 
 Source code copyright DJ Delorie is distributed under the terms of the

-GNU General Public Licence, with the following exceptions:
+GNU General Public License, with the following exceptions:

 
 * Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and
   libemu.a are distributed under the terms of the GNU Library General
 
 * Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and
   libemu.a are distributed under the terms of the GNU Library General


@@ -70,7 +68,7 @@ GNU General Public Licence, with the following exceptions:
 
 * Any existing copyright or authorship information in any given source
   file must remain intact.  If you modify a source file, a notice to that
 
 * Any existing copyright or authorship information in any given source
   file must remain intact.  If you modify a source file, a notice to that

-  effect must be added to the authorship information in the source file. 
+  effect must be added to the authorship information in the source file.

 
 * Runtime binaries, as provided by DJ in DJGPP, may be distributed
   without sources ONLY if the recipient is given sufficient information
 
 * Runtime binaries, as provided by DJ in DJGPP, may be distributed
   without sources ONLY if the recipient is given sufficient information