Remove --- and +++ lines from NEWS file.

[gnu-emacs] / msdos / README

diff --git a/msdos/README b/msdos/README
index 6f08e6e962447e849fcd3f11e5247e2e76816cd7..da0cf0801ae4a1a792566692680fa348e5b8bdba 100644 (file)
--- a/msdos/README
+++ b/msdos/README
@@ -1,4 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

   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.
 


@@ -12,7 +12,7 @@ Windows 3.X.  Since these are binary files, their copyright notice is
 reproduced here:
 
 # Copyright (C) 1993, 2002, 2003, 2004, 2005,
 reproduced here:
 
 # Copyright (C) 1993, 2002, 2003, 2004, 2005,

-#   2006, 2007 Free Software Foundation, Inc.
+#   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

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


@@ -145,16 +145,17 @@ Accordingly, in February 2007 we relicensed the files is_exec.c and
 sigaction.c as used in GNU Emacs under the GNU GPL.
 
 Copies of both the GNU General Public License and GNU Lesser (Library)
 sigaction.c as used in GNU Emacs under the GNU GPL.
 
 Copies of both the GNU General Public License and GNU Lesser (Library)

-Public License may be obtained from: the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+Public License may be obtained from <http://www.gnu.org/licenses/>, or:
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.

 
 \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 3, 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


@@ -162,6 +163,4 @@ 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/>.