Switch to standard GPL text for license.

11 files changed, 189 insertions, 22 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a303c38ba5..119ced810fa 100644
--- 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 f2559301f0a..d51791d9360 100644
--- 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 75dd37940d0..420688ac385 100644
--- 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 7ecccab5b5e..343eec689a2 100644
--- 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 04310b34cad..e611bd564c5 100644
--- 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 893a6497996..7cce26c5acc 100644
--- 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 99606fe68ea..4572c8c0a3a 100644
--- 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 8dde8ff137f..8abb6e89580 100644
--- 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 ff6b3b25461..09a2325536f 100644
--- 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 2a644e13585..b6bc7e3e78a 100644
--- 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 205a2ca5bc2..2751968ca89 100644
--- 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.
+
+
+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.