Switch to standard GPL text for license.

diff --git a/CONTRIBUTE b/CONTRIBUTE
index 97af1c44418ade4ea2e495f1350cc8687dc67e5a..0f7fe6855b555acbeef40fb8937042ea8a0933c1 100644 (file)
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -1,6 +1,5 @@
 Copyright (C) 2006, 2007  Free Software Foundation, Inc.
-Copying and distribution of this file, with or without modification,
-are permitted provided the copyright notice and this notice are preserved.
+See end for license conditions.
 
 
                        Contributing to Emacs
@@ -187,6 +186,8 @@ The file etc/DEBUG describes how to debug Emacs bugs.
 
 * How to Maintain Copyright Years for GNU Emacs
 
+See admin/notes/copyright.
+
 ** Our lawyer says it is ok if we add, to each file that has been in Emacs
 since Emacs 21 came out in 2001, all the subsequent years.  We don't
 need to check whether *that file* was changed in those years.
@@ -200,6 +201,24 @@ the year it was added to Emacs, and all subsequent years.
 notice, while maintaining the full list of years in the copyright notice
 in the comments.
 
+
+\f
+This file is part of GNU Emacs.
+
+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.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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.
 \f
 Local variables:
 mode: outline

diff --git a/ChangeLog b/ChangeLog
index 0e3e77d4dfa990a9558c3d3b0251f408aab47064..17c2d0bff1dc9cd0a8d2cf5774de7dad68663f7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6395,7 +6395,22 @@
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
        2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: ac61a779-1480-4884-b292-d0c39c127a73

diff --git a/INSTALL b/INSTALL
index 3bcce41877dad3b6fb47c0f3998bbe8848202586..5b4c2bef0153f3f05d9b9958e2c00b6a28ad50ad 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 GNU Emacs Installation Guide
 Copyright (C) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
 2005, 2006, 2007  Free Software Foundation, Inc.
-See the end of the file for copying permissions.
+See the end of the file for license conditions.
 
 
 BASIC INSTALLATION
@@ -906,17 +906,19 @@ is_exec.c and sigaction.c.  To work around the bugs, compile these
 files and link them into temacs.  Djgpp versions 2.01 and later have
 these bugs fixed, so upgrade if you can before building Emacs.
 \f
-COPYING PERMISSIONS
-
-   Permission is granted to anyone to make or distribute verbatim copies
-   of this document as received, in any medium, provided that the
-   copyright notice and permission notice are preserved,
-   and that the distributor grants the recipient permission
-   for further redistribution as permitted by this notice.
-
-   Permission is granted to distribute modified versions
-   of this document, or of portions of it,
-   under the above conditions, provided also that they
-   carry prominent notices stating who last changed them,
-   and that any new or changed statements about the activities
-   of the Free Software Foundation are approved by the Foundation.
+This file is part of GNU Emacs.
+
+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.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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.

diff --git a/INSTALL.CVS b/INSTALL.CVS
index 2294e754c22d88fbb74fe7b4d6e5a361ddaf511f..7e785fcac0da95c17cc40f2505eac9a09ec0b107 100644 (file)
--- a/INSTALL.CVS
+++ b/INSTALL.CVS
@@ -1,7 +1,6 @@
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-Copying and distribution of this file, with or without modification,
-are permitted provided the copyright notice and this notice are preserved.
+See the end of the file for license conditions.
 
 
              Building and Installing Emacs from CVS
@@ -83,3 +82,21 @@ Host subversions.gnu.org
      Protocol 2
      ForwardX11 no
      User YOUR_USERID
+
+\f
+This file is part of GNU Emacs.
+
+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.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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.

diff --git a/README b/README
index 79423492b44f940ef6ce21b14a854c03e5dbeafd..7eef4b8e2ed9c396aeb1c5a434ed9e625d8943ca 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,6 @@
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-Copying and distribution of this file, with or without modification,
-are permitted provided the copyright notice and this notice are preserved.
+See the end of the file for license conditions.
 
 
 This directory tree holds version 22.0.93 of GNU Emacs, the extensible,
@@ -93,3 +92,21 @@ There are several subdirectories:
 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
+This file is part of GNU Emacs.
+
+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.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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.

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index b8fc313228ba9d67788a87e0d5d9b209d371bbf4..176197e630858484379f9ae65c997864d431be07 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1336,7 +1336,22 @@
 
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
        2005, 2006, 2007  Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 0cd8ab87-d764-40d9-b86d-d00c71887a9e

diff --git a/mac/ChangeLog b/mac/ChangeLog
index c498736a1a1145fe791d79b97738aa1acc5f1e8b..735ea36e28be0d15779f8f71c45a65b5711de13b 100644 (file)
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -873,7 +873,22 @@
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
        2006, 2007 Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: c6fd43f7-0e50-4c0a-ac82-1c8a9e45a9bf

diff --git a/mac/INSTALL b/mac/INSTALL
index 35455bb030d59cad43ba4a42e142b594bcbeacc0..3711a7e1e2d579dcfe974448aff9ceb6518df458 100644 (file)
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -2,17 +2,8 @@
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
    2006, 2007 Free Software Foundation, Inc.
+See the end of the file for license conditions.
 
-   Permission is granted to anyone to make or distribute verbatim
-   copies of this document as received, in any medium, provided that
-   the copyright notice and permission notice are preserved, and that
-   the distributor grants the recipient permission for further
-   redistribution as permitted by this notice.
-
-   Permission is granted to distribute modified versions of this
-   document, or of portions of it, under the above conditions,
-   provided also that they carry prominent notices stating who last
-   changed them.
 
 * BUILDING EMACS ON MAC OS X
 
@@ -218,3 +209,21 @@ with PowerPC builds of Emacs; you will have to recompile for Intel.
 Therefore, builds of Emacs are architecture specific.
 
 Enjoy!
+
+\f
+This file is part of GNU Emacs.
+
+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.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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.

diff --git a/mac/README b/mac/README
index 419ba75b04393c0292569491dbe3b18e93113e87..1d8cc40e545a41037a01517f16abd8c036b3aa50 100644 (file)
--- a/mac/README
+++ b/mac/README
@@ -2,17 +2,8 @@ Emacs for Mac OS Classic and Mac OS X
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
    2006, 2007 Free Software Foundation, Inc.
+See the end of the file for license conditions.
 
-   Permission is granted to anyone to make or distribute verbatim
-   copies of this document as received, in any medium, provided that
-   the copyright notice and permission notice are preserved, and that
-   the distributor grants the recipient permission for further
-   redistribution as permitted by this notice.
-
-   Permission is granted to distribute modified versions of this
-   document, or of portions of it, under the above conditions,
-   provided also that they carry prominent notices stating who last
-   changed them.
 
 This directory contains the files needed to build Emacs on the Mac OS
 Classic and Mac OS X.  Many of the major features of the Unix version
@@ -53,3 +44,20 @@ emacs-pretest-bug@gnu.org.
 
 Steven
 <steven.tamm@mac.com>
+\f
+This file is part of GNU Emacs.
+
+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.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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.

diff --git a/man/ChangeLog b/man/ChangeLog
index 54e8e3d2fffe6872797c1b46d77d1522107e6b91..98ccdd7818f361e3c1964a2c0a0b177fe8a7e683 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -7523,7 +7523,22 @@
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
       2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: f1d62776-3ed5-4811-9d96-267252577dbd

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 4a1b880edae13e24931fd401adedc2ff277a8990..24f83276b926d5090ef7fc98f57b3f0d89723638 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -638,7 +638,22 @@
 
     Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
        2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: b602fbb5-3776-4053-8de2-03da33c29d44

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 3757dd81bdfd87768828624a1eb23e19af4992ea..75afa6b32358cc3b001a44a579cdcc4a887306d3 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1320,7 +1320,22 @@
 
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
        2005, 2006, 2007 Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: b3d2c29c-04a0-45d0-b52d-57354711c414

diff --git a/nt/INSTALL b/nt/INSTALL
index 24d2e1ed8da87b4795ff7485de7d4888c65fa368..b0a1d923520c9c5d7c8a03cf89187c7eae48a1ae 100644 (file)
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -3,7 +3,7 @@
 
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
-  See the end of the file for copying permissions.
+  See the end of the file for license conditions.
 
 * For the impatient
 
@@ -419,17 +419,20 @@
   thread, so this should only be a problem if you've explicitly switched
   threads.
 
-COPYING PERMISSIONS
+\f
+This file is part of GNU Emacs.
 
-  Permission is granted to anyone to make or distribute verbatim copies
-  of this document as received, in any medium, provided that the
-  copyright notice and permission notice are preserved,
-  and that the distributor grants the recipient permission
-  for further redistribution as permitted by this notice.
+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.
 
-  Permission is granted to distribute modified versions
-  of this document, or of portions of it,
-  under the above conditions, provided also that they
-  carry prominent notices stating who last changed them,
-  and that any new or changed statements about the activities
-  of the Free Software Foundation are approved by the Foundation.
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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.

diff --git a/nt/README b/nt/README
index c7aad45d081ad25f06d6e53807c77027e47084aa..556db89b10096d447505918beb313e72df3b63aa 100644 (file)
--- a/nt/README
+++ b/nt/README
@@ -2,7 +2,7 @@
 
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
      2007 Free Software Foundation, Inc.
-  See the end of the INSTALL file in this directory for copying permissions.
+  See the end of the file for license conditions.
 
   This directory contains support for compiling and running GNU Emacs on
   Windows NT, Windows 95, and their successors.  This port supports all
@@ -68,3 +68,21 @@
   cases there is a function to report bugs in a specific package;
   e.g. M-x gnus-bug for Gnus, M-x c-submit-bug-report for C/C++/Java
   mode, etc.
+
+\f
+This file is part of GNU Emacs.
+
+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.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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.

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index b44c310165a8ee5e10a5277533baa3c3c1605508..c3f406300929d7f23c2b867b1bf3dab5571a5700 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -446,7 +446,22 @@
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
        2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 8b17c869-6677-40ce-be86-e62cf34061cf

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a303c38ba51cbe693389895e7a9a1415452ef08..119ced810faea188b17503dccf02542639937af1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -27305,7 +27305,22 @@ See ChangeLog.9 for earlier changes.
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
        2006, 2007 Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 5dcc435f-4038-4141-b3bf-5be51cd76bd4

diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index f2559301f0a38c5727e535fbe9ec9420cdd4eba3..d51791d936060c104df20e7fd320145d2ddc597b 100644 (file)
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3523,7 +3523,22 @@
 
     Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007
        Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 2d2c1086-b0a5-437c-bc58-fb38ce2e0f9b

diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 75dd37940d03d25399d36eda2de9235ca864fdd8..420688ac3856f3efe9d71780c14edfc92add44a7 100644 (file)
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4773,7 +4773,22 @@ See ChangeLog.1 for earlier changes.
 
     Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006,
        2007  Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 3334fc8a-ec24-4601-99fc-4c8adc2b31bb

diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 7ecccab5b5e298e70cdb636086bc38d683c19e96..343eec689a2b4055982776242e3237fbab43dd35 100644 (file)
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16526,7 +16526,22 @@ See ChangeLog.2 for earlier changes.
 
     Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007
        Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 136a8e5c-4f83-403b-9132-874f1c47f8a9

diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index 04310b34cad82a3218d3048a3d6441951132cfb0..e611bd564c5bf9c2d18cf455bbc3cd5afb635d0c 100644 (file)
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6905,7 +6905,22 @@ See ChangeLog.3 for earlier changes.
 
     Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
        Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 2e44924a-e45a-4129-ad93-1f7bb410b609

diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 893a649799629274b5681bb03113b3a08f380007..7cce26c5acc6ab277e17153cf6f6c3fa9141ccd6 100644 (file)
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7146,7 +7146,22 @@ See ChangeLog.4 for earlier changes.
 
     Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
        Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: aea244d6-d513-4b51-8dba-5ecdf1aa5875

diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 99606fe68ea6cc36f8f74fe4a296b13473bb32aa..4572c8c0a3ab8d4df539e1de7513d580e48fe860 100644 (file)
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -5356,7 +5356,22 @@ See ChangeLog.5 for earlier changes.
 
     Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007
        Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 66a98e1c-2268-45e8-8a57-286b9c85a4e9

diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 8dde8ff137f3b72eb33feef2d6967328d2f1153f..8abb6e895807fdf5f0c64c2e6b4fceebc6afb5c4 100644 (file)
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11097,7 +11097,22 @@ See ChangeLog.6 for earlier changes.
 
     Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
        Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 3b03e091-1123-4031-b67d-41683932cc48

diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index ff6b3b254613055f68b2d40d52fa9d5a594b3e4a..09a2325536ff995a77fc3f83d9b36c958f695d23 100644 (file)
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13993,7 +13993,22 @@ See ChangeLog.7 for earlier changes.
 
     Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
        Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 4d73444a-8f6e-4255-92a6-d3abc438b8d3

diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index 2a644e135856658bca2aa9848de1bf0963f28a67..b6bc7e3e78ad0669b313e666bb8ef929ec8032c1 100644 (file)
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -13296,7 +13296,22 @@ See ChangeLog.8 for earlier changes.
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
        Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  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.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  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.
 
 ;;; arch-tag: 38875948-6e89-4f08-b0ca-ff328f1e8b72

diff --git a/src/README b/src/README
index 205a2ca5bc24feb531a48e10f49f6b2a2ac79a3c..2751968ca898544c00ea0c5f1d1a67eb532bd3fe 100644 (file)
--- a/src/README
+++ b/src/README
@@ -1,7 +1,6 @@
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-Copying and distribution of this file, with or without modification,
-are permitted provided the copyright notice and this notice are preserved.
+See the end of the file for license conditions.
 
 
 This directory contains the source files for the C component of GNU Emacs.
@@ -32,3 +31,21 @@ systems where you are not overly concerned with security, since it
 either requires that you install Emacs with SYSPRV or make SYSUAF.DAT
 world readable.  Otherwise, Emacs can determine information about the
 current user, but no one else.
+
+\f
+This file is part of GNU Emacs.
+
+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.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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.