X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/9ee365d565205366d61d9b50dd2a15ef903be983..09faee72dd0743a5b46444b5e917ee1259843788:/msdos/README diff --git a/msdos/README b/msdos/README index 11ff3975e0..9b5b71495c 100644 --- a/msdos/README +++ b/msdos/README @@ -1,5 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 - Free Software Foundation, Inc. +Copyright (C) 2001-2013 Free Software Foundation, Inc. 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: -# Copyright (C) 1993, 2002, 2003, 2004, 2005, -# 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 1993, 2002-2013 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -31,7 +29,8 @@ NOTE ON THE LEGAL STATUS OF THE FILES IS_EXEC.C, SIGACTION.C As distributed with GNU Emacs, the files is_exec.c and sigaction.c are Copyright (C) 1995 DJ Delorie, and are licensed under the terms of the -GNU General Public License version 2 or later (see COPYING). +GNU General Public License version 3 (see COPYING), or (at your +option) any later version. Here we record the details of the legal history of these files. @@ -61,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 -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 @@ -69,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 - 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 @@ -144,16 +143,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) -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 , or: +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. 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 -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 @@ -161,6 +161,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 -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 .