changeset 75774:dc23aaa67696

Switch to standard GPL text for license.
author Glenn Morris <rgm@gnu.org>
date Sun, 11 Feb 2007 01:18:25 +0000
parents 8344ba1076b6
children 4fbfcc74f257
files admin/ChangeLog etc/ChangeLog etc/DEBUG etc/DISTRIB etc/ERC-NEWS etc/GNUS-NEWS etc/HELLO etc/MACHINES etc/MH-E-NEWS etc/MORE.STUFF etc/NEWS etc/NEWS.1-17 etc/NEWS.18 etc/NEWS.19 etc/NEWS.20 etc/NEWS.21 etc/PROBLEMS etc/README etc/TODO etc/Xkeymap.txt etc/emacs.csh leim/ChangeLog lib-src/ChangeLog lisp/ChangeLog lisp/ChangeLog.1 lisp/ChangeLog.10 lisp/ChangeLog.11 lisp/ChangeLog.2 lisp/ChangeLog.3 lisp/ChangeLog.4 lisp/ChangeLog.5 lisp/ChangeLog.6 lisp/ChangeLog.7 lisp/ChangeLog.8 lisp/ChangeLog.9 lisp/calc/README lisp/erc/ChangeLog lisp/erc/ChangeLog.01 lisp/erc/ChangeLog.02 lisp/erc/ChangeLog.03 lisp/erc/ChangeLog.04 lisp/erc/ChangeLog.05 lisp/gnus/ChangeLog lisp/gnus/ChangeLog.1 lisp/gnus/ChangeLog.2 lisp/mh-e/ChangeLog lisp/mh-e/ChangeLog.1 lisp/url/ChangeLog lispintro/ChangeLog lispintro/README lispref/ChangeLog lispref/README
diffstat 52 files changed, 970 insertions(+), 317 deletions(-) [+]
line wrap: on
line diff
--- a/admin/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/admin/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -414,9 +414,24 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    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.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+      2007  Free Software Foundation, Inc.
+
+  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: 97728c77-77c0-4156-b669-0e8c07d94e5a
--- a/etc/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -3268,7 +3268,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: 094f3a51-bd72-44d0-8fac-2ac242c6c5b1
--- a/etc/DEBUG	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/DEBUG	Sun Feb 11 01:18:25 2007 +0000
@@ -1,17 +1,9 @@
 Debugging GNU Emacs
+
 Copyright (C) 1985, 2000, 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.
 
 [People who debug Emacs on Windows using native Windows debuggers
 should read the Windows-specific section near the end of this
@@ -747,6 +739,24 @@
 of these variables.
 
 
+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.
+
+
 Local variables:
 mode: outline
 paragraph-separate: "[ 	]*$"
--- a/etc/DISTRIB	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/DISTRIB	Sun Feb 11 01:18:25 2007 +0000
@@ -4,12 +4,11 @@
 
 	   GNU Emacs availability information, October 2000
 
-Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995,
+  1998, 2000, 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 provided that the
-	copyright notice and this permission notice are preserved.
 
 GNU Emacs is legally owned by the Free Software Foundation, but we
 regard the foundation more as its custodian on behalf of the public.
@@ -97,3 +96,20 @@
 			Richard M Stallman
 			Chief GNUisance,
 			President of the Free Software 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.
--- a/etc/ERC-NEWS	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/ERC-NEWS	Sun Feb 11 01:18:25 2007 +0000
@@ -1,8 +1,7 @@
 ERC NEWS                                                       -*- outline -*-
 
 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 the end of the file for license conditions.
 
 
 * Changes in ERC 5.2 (stable pre-release for Emacs 22)
@@ -849,4 +848,22 @@
 'erc-stamp), you can customize the variable `erc-timestamp-mode', and
 the rest should be automatic.
 
+
+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: 2b21b387-6cdc-4192-889c-6743cfffdcb1
--- a/etc/GNUS-NEWS	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/GNUS-NEWS	Sun Feb 11 01:18:25 2007 +0000
@@ -1,7 +1,8 @@
 GNUS NEWS -- history of user-visible changes.
+
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
    2006, 2007 Free Software Foundation, Inc.
-See the end for copying conditions.
+See the end of the file for license conditions.
 
 Please send Gnus bug reports to bugs@gnus.org.
 For older news, see Gnus info node "New Features".
@@ -518,20 +519,24 @@
 * For older news, see Gnus info node "New Features".
 
 ----------------------------------------------------------------------
-Copyright information:
+
+This file is part of GNU Emacs.
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007 Free Software Foundation, Inc.
+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 anyone to make or distribute verbatim copies
-   of this document as received, in any medium, provided that the
-   copyright notice and this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
+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.
 
-   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.
+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.
+
 
 Local variables:
 mode: outline
--- a/etc/HELLO	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/HELLO	Sun Feb 11 01:18:25 2007 +0000
@@ -64,24 +64,24 @@
 
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-Free Software Foundation, Inc.
+  Free Software Foundation, Inc.
 
-COPYING PERMISSIONS:
+This file is part of GNU Emacs.
 
-    This document 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 of the License, or
-    (at your option) any later version.
+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.
 
-    This program 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.
+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 this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+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.
 
 ;;; Local Variables:
 ;;; tab-width: 32
--- a/etc/MACHINES	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/MACHINES	Sun Feb 11 01:18:25 2007 +0000
@@ -2,7 +2,7 @@
 
 Copyright (C) 1989, 1990, 1992, 1993, 1998, 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.
 
 This is a list of the status of GNU Emacs on various machines and systems.
 
@@ -1501,17 +1501,22 @@
 fill-prefix: "  "
 End:
 
-COPYING PERMISSIONS:
+
+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.
 
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this file, to deal in the file without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the file, and to
-    permit persons to whom the file is furnished to do so, subject to
-    the following condition:
+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.
 
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the file.
-
+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: 7d2e93c7-e982-40ec-9055-3cd064042473
--- a/etc/MH-E-NEWS	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/MH-E-NEWS	Sun Feb 11 01:18:25 2007 +0000
@@ -1,11 +1,9 @@
 * COPYRIGHT
 
 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 in any medium without royalty provided the copyright
-notice and this notice are preserved.
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
 
 * Changes in MH-E 8.0.3
 
@@ -3120,6 +3118,24 @@
 *** `mh-clean-message-header': find end of headers even if no body.
 
 
+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.
+
+
 Local variables:
 mode: outline
 paragraph-separate: "[ 	]*$"
--- a/etc/MORE.STUFF	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/MORE.STUFF	Sun Feb 11 01:18:25 2007 +0000
@@ -1,7 +1,8 @@
 More Neat Stuff for your Emacs
+
 Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-Free Software Foundation, Inc.
-See the end of the file for copying permissions.
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
 
 This file describes GNU Emacs programs and resources that are
 maintained by other people.  Some of these may become part of the
@@ -279,12 +280,21 @@
 eval: (goto-address)
 End:
 
-COPYING PERMISSIONS
-    Permission to use, copy, modify, and distribute this
-    software and its documentation for any purpose and without
-    fee is hereby granted, provided that the above copyright
-    notice appear in all copies and that both that copyright
-    notice and this permission notice appear in supporting
-    documentation.
+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: c1d4e7c8-db85-44e6-909e-659e2b20fefa
--- a/etc/NEWS	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/NEWS	Sun Feb 11 01:18:25 2007 +0000
@@ -1,7 +1,8 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-06-04
+
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
           Free Software Foundation, Inc.
-See the end for copying conditions.
+See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
 If possible, use M-x report-emacs-bug.
@@ -5986,20 +5987,23 @@
 
 
 ----------------------------------------------------------------------
-Copyright information:
-
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-	  Free Software Foundation, Inc.
-
-   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 this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
-
-   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 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.
+
 
 Local variables:
 mode: outline
--- a/etc/NEWS.1-17	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/NEWS.1-17	Sun Feb 11 01:18:25 2007 +0000
@@ -1,6 +1,8 @@
 GNU Emacs NEWS -- history of user-visible changes.  26-Mar-1986
+
 Copyright (C) 1985, 1986, 2006, 2007  Free Software Foundation, Inc.
-See the end for copying conditions.
+See the end of the file for license conditions.
+
 
 This file is about changes in emacs versions 1 through 17.
 
@@ -2509,19 +2511,23 @@
 
 
 ----------------------------------------------------------------------
-Copyright information:
-
-Copyright (C) 1985, 1986, 2006, 2007  Free Software Foundation, Inc.
-
-   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 this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
-
-   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 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.
+
 
 Local variables:
 mode: text
--- a/etc/NEWS.18	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/NEWS.18	Sun Feb 11 01:18:25 2007 +0000
@@ -1,6 +1,8 @@
 GNU Emacs NEWS -- history of user-visible changes.  17-Aug-1988
+
 Copyright (C) 1988, 2006, 2007  Free Software Foundation, Inc.
-See the end for copying conditions.
+See the end of the file for license conditions.
+
 
 This file is about changes in emacs version 18.
 
@@ -1599,19 +1601,23 @@
 
 
 ----------------------------------------------------------------------
-Copyright information:
+This file is part of GNU Emacs.
 
-Copyright (C) 1988, 2006, 2007  Free Software Foundation, Inc.
+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 anyone to make or distribute verbatim copies
-   of this document as received, in any medium, provided that the
-   copyright notice and this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
+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.
 
-   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.
+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.
+
 
 Local variables:
 mode: text
--- a/etc/NEWS.19	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/NEWS.19	Sun Feb 11 01:18:25 2007 +0000
@@ -1,6 +1,8 @@
 GNU Emacs NEWS -- history of user-visible changes.  1992.
+
 Copyright (C) 1993, 1994, 1995, 2001, 2006, 2007 Free Software Foundation, Inc.
-See the end for copying conditions.
+See the end of the file for license conditions.
+
 
 This file is about changes in emacs versions 19.
 
@@ -6518,19 +6520,23 @@
 
 
 ----------------------------------------------------------------------
-Copyright information:
-
-Copyright (C) 1993, 1994, 1995, 2001, 2006, 2007 Free Software Foundation, Inc.
-
-   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 this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
-
-   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 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.
+
 
 Local variables:
 mode: outline
--- a/etc/NEWS.20	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/NEWS.20	Sun Feb 11 01:18:25 2007 +0000
@@ -1,7 +1,9 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
+
 Copyright (C) 1999, 2000, 2001, 2006, 2007
-          Free Software Foundation, Inc.
-See the end for copying conditions.
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
 If possible, use M-x report-emacs-bug.
@@ -4492,20 +4494,23 @@
 
 
 ----------------------------------------------------------------------
-Copyright information:
-
-Copyright (C) 1999, 2000, 2001, 2006, 2007
-	  Free Software Foundation, Inc.
-
-   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 this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
-
-   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 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.
+
 
 Local variables:
 mode: outline
--- a/etc/NEWS.21	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/NEWS.21	Sun Feb 11 01:18:25 2007 +0000
@@ -1,7 +1,9 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
+
 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-          Free Software Foundation, Inc.
-See the end for copying conditions.
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
 
 This file is about changes in emacs version 21.
 
@@ -4879,20 +4881,23 @@
 
 
 ----------------------------------------------------------------------
-Copyright information:
-
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-	  Free Software Foundation, Inc.
-
-   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 this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
-
-   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 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.
+
 
 Local variables:
 mode: outline
--- a/etc/PROBLEMS	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/PROBLEMS	Sun Feb 11 01:18:25 2007 +0000
@@ -1,3 +1,9 @@
+Copyright (C) 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+  2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+
 This file describes various problems that have been encountered
 in compiling, installing and running GNU Emacs.  Try doing Ctl-C Ctl-t
 and browsing through the outline headers.
@@ -3709,12 +3715,24 @@
 of machine defines NO_UNION_TYPE.
 
 
-Copyright (C) 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
-
-Copying and redistribution of this file with or without modification
-are permitted without royalty provided this notice is 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.
+
+
 Local variables:
 mode: outline
 paragraph-separate: "[ 	]*$"
--- a/etc/README	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/README	Sun Feb 11 01:18:25 2007 +0000
@@ -1,3 +1,8 @@
+Copyright (C) 1992, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+
 This directory contains the architecture-independent files used by or
 with Emacs.  This includes some text files of documentation for GNU
 Emacs or of interest to Emacs users, and the file of dumped docstrings
@@ -24,19 +29,20 @@
     Free Software Foundation, Inc.
   License: GNU General Public License version 2 or later (see COPYING)
 
+
+This file is part of GNU Emacs.
 
-Copyright (C) 1992, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-Free Software Foundation, Inc.
-
-
-COPYING PERMISSIONS:
+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 hereby granted, free of charge, to any person obtaining
-    a copy of this file, to deal in the file without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the file, and to
-    permit persons to whom the file is furnished to do so, subject to
-    the following condition:
+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.
 
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the file.
+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.
--- a/etc/TODO	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/TODO	Sun Feb 11 01:18:25 2007 +0000
@@ -1,8 +1,9 @@
 Emacs TODO List                                                   -*-outline-*-
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-Free Software Foundation, Inc.
-See the end of the file for copying permissions.
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
 
 If you are ready to start working on any of these TODO items, we
 appreciate your help; please write to emacs-devel@gnu.org so we can be
@@ -555,16 +556,22 @@
 ** Fix unexelf.c to handle the .data.rel and .data.rel.local
    sections made by GCC 3.4 on IRIX.
 
-COPYING PERMISSIONS:
+
+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.
 
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this file, to deal in the file without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the file, and to
-    permit persons to whom the file is furnished to do so, subject to
-    the following condition:
+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.
 
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the file.
+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: b0a3e40b-726a-457d-9999-ba848321b036
--- a/etc/Xkeymap.txt	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/Xkeymap.txt	Sun Feb 11 01:18:25 2007 +0000
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 #   Free Software Foundation, Inc.
-# See the end of the file for copying conditions.
+# See the end of the file for license conditions.
 #
 # This file contains the default keyboard mapping.  The first column contains a X keyboard code; the other
 # 16 columns contain the mapping of the keycode to a character string, with various combinations
@@ -102,15 +102,19 @@
 # tab-width: 4
 # End:
 #
-#  COPYING CONDITIONS
-#    Permission is hereby granted, free of charge, to any person obtaining
-#    a copy of this file, to deal in the file without restriction, including
-#    without limitation the rights to use, copy, modify, merge, publish,
-#    distribute, sublicense, and/or sell copies of the file, and to
-#    permit persons to whom the file is furnished to do so, subject to
-#    the following condition:
+# This document 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.
+# 
+# This document 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 this document; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
-#    The above copyright notice and this permission notice shall be
-#    included in all copies or substantial portions of the file.
-
 # arch-tag: cbaa71af-719b-4647-a2c1-cd4d36a4fc64
--- a/etc/emacs.csh	Sun Feb 11 01:14:59 2007 +0000
+++ b/etc/emacs.csh	Sun Feb 11 01:18:25 2007 +0000
@@ -1,21 +1,41 @@
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-# Free Software Foundation, Inc.
-#
-# This defines a csh command named `edit' which resumes an
-# existing Emacs or starts a new one if none exists.
-# One way or another, any arguments are passed to Emacs to specify files
-# (provided you have loaded `resume.el').
-# - Michael DeCorte
+### emacs.csh
+
+## Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+##   Free Software Foundation, Inc.
+
+## Author: Michael DeCorte
+
+## This program 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.
+
+## This program 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.
 
-# These are the possible values of $whichjob
-# 1 = new ordinary emacs (the -nw is so that it doesn't try to do X)
-# 2 = resume emacs
-# 3 = new emacs under X (-i is so that you get a reasonable icon)
-# 4 = resume emacs under X
-# 5 = new emacs under suntools
-# 6 = resume emacs under suntools
-# 7 = new emacs under X and suntools - doesn't make any sense, so use X
-# 8 = resume emacs under X and suntools - doesn't make any sense, so use X
+## You should have received a copy of the GNU General Public License
+## along with this program; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+## Boston, MA 02110-1301, USA.
+
+### Commentary:
+
+## This defines a csh command named `edit' which resumes an
+## existing Emacs or starts a new one if none exists.
+## One way or another, any arguments are passed to Emacs to specify files
+## (provided you have loaded `resume.el').
+
+## These are the possible values of $whichjob
+## 1 = new ordinary emacs (the -nw is so that it doesn't try to do X)
+## 2 = resume emacs
+## 3 = new emacs under X (-i is so that you get a reasonable icon)
+## 4 = resume emacs under X
+## 5 = new emacs under suntools
+## 6 = resume emacs under suntools
+## 7 = new emacs under X and suntools - doesn't make any sense, so use X
+## 8 = resume emacs under X and suntools - doesn't make any sense, so use X
 set EMACS_PATTERN="^\[[0-9]\]  . Stopped ............ $EMACS"
 
 alias edit 'set emacs_command=("emacs -nw \!*" "fg %emacs" "emacs -i \!* &"\
@@ -27,17 +47,4 @@
  test -S ~/.emacs_server && emacsclient \!* \
  || echo `pwd` \!* >! ~/.emacs_args && eval $emacs_command[$whichjob]'
 
-#COPYING PERMISSIONS:
-#
-#    Permission is hereby granted, free of charge, to any person obtaining
-#    a copy of this file, to deal in the file without restriction, including
-#    without limitation the rights to use, copy, modify, merge, publish,
-#    distribute, sublicense, and/or sell copies of the file, and to
-#    permit persons to whom the file is furnished to do so, subject to
-#    the following condition:
-#
-#    The above copyright notice and this permission notice shall be
-#    included in all copies or substantial portions of the file.
-
-
 # arch-tag: 433d58df-15b9-446f-ad37-f0393e3a23d4
--- a/leim/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/leim/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -1688,7 +1688,22 @@
 
     Copyright (C) 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: 4b364045-a476-4ff7-92ad-dde58dbd45b4
--- a/lib-src/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/lib-src/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -6212,7 +6212,22 @@
     Copyright (C) 1988, 1989, 1990, 1991, 1992, 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: 2d979296-954c-448e-95c1-b46d134513dc
--- a/lisp/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -31455,7 +31455,22 @@
 ;; End:
 
     Copyright (C) 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: e39939be-dab3-400e-86f5-0e2701a883c1
--- a/lisp/ChangeLog.1	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.1	Sun Feb 11 01:18:25 2007 +0000
@@ -3247,8 +3247,23 @@
 		in case user's init file has changed them.
 
     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.
+      Free Software Foundation, Inc.
+
+  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: b6060738-7fac-4c9c-80ae-67995bae78a7
--- a/lisp/ChangeLog.10	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.10	Sun Feb 11 01:18:25 2007 +0000
@@ -23533,9 +23533,25 @@
 ;; coding: iso-2022-7bit
 ;; End:
 
-    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.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+      2007  Free Software Foundation, Inc.
+
+  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: 5fcf8004-6f58-452a-b9d6-6950323a19c1
--- a/lisp/ChangeLog.11	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.11	Sun Feb 11 01:18:25 2007 +0000
@@ -14336,8 +14336,24 @@
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 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.
+    Copyright (C) 2003, 2004, 2005, 2006, 2007
+      Free Software Foundation, Inc.
+
+  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: 2fe8d7b0-27e3-4634-a0b7-db70ff071825
--- a/lisp/ChangeLog.2	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.2	Sun Feb 11 01:18:25 2007 +0000
@@ -3994,9 +3994,24 @@
 
 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.
+    Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006,
+	2007  Free Software Foundation, Inc.
+
+  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: c315ba16-14ba-4b07-86e6-013a18f11be7
--- a/lisp/ChangeLog.3	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.3	Sun Feb 11 01:18:25 2007 +0000
@@ -12615,9 +12615,24 @@
 
 See ChangeLog.2 for earlier changes.
 
-    Copyright (C) 1989, 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.
+    Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, 2005, 2006,
+    2007  Free Software Foundation, Inc.
+
+  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: f07a3446-5672-464a-8fdc-2ca92e8e7b2a
--- a/lisp/ChangeLog.4	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.4	Sun Feb 11 01:18:25 2007 +0000
@@ -8939,9 +8939,24 @@
 
 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.
+    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+      2007  Free Software Foundation, Inc.
+
+  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: 91035822-35c7-44a9-8417-2454b88c3db2
--- a/lisp/ChangeLog.5	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.5	Sun Feb 11 01:18:25 2007 +0000
@@ -9261,9 +9261,24 @@
 
 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.
+    Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006,
+      2007  Free Software Foundation, Inc.
+
+  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: 1a8fbb45-25d0-48e2-a926-29ca4e3d343a
--- a/lisp/ChangeLog.6	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.6	Sun Feb 11 01:18:25 2007 +0000
@@ -8022,9 +8022,25 @@
 
 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.
+    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
+      2007  Free Software Foundation, Inc.
+
+  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: f90e8ffe-6bd0-4423-97d9-637ac4382520
--- a/lisp/ChangeLog.7	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.7	Sun Feb 11 01:18:25 2007 +0000
@@ -23139,9 +23139,24 @@
 
 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.
+    Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
+      2007  Free Software Foundation, Inc.
+
+  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: 0995d517-13da-45ab-9c2d-7911aa25512b
--- a/lisp/ChangeLog.8	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.8	Sun Feb 11 01:18:25 2007 +0000
@@ -9988,9 +9988,24 @@
 
 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.
+    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+      2007  Free Software Foundation, Inc.
+
+  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: efdc1531-ed46-4e14-be59-bee4b23088f3
--- a/lisp/ChangeLog.9	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.9	Sun Feb 11 01:18:25 2007 +0000
@@ -20695,9 +20695,25 @@
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2000, 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.
+    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+      2007  Free Software Foundation, Inc.
+
+  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: a7cd2b86-43eb-409b-883f-3700fa85334f
--- a/lisp/calc/README	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/calc/README	Sun Feb 11 01:18:25 2007 +0000
@@ -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 Calc, an advanced desk calculator for GNU
@@ -229,3 +228,20 @@
    the FTP version of the Calc distribution, the file README.prev
    contains a detailed change history from 1.00 up to 2.00.
 
+
+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.
--- a/lisp/erc/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/erc/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -1343,8 +1343,23 @@
 See ChangeLog.05 for earlier changes.
 
     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.
+
+  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.
 
 ;; Local Variables:
 ;; coding: utf-8
--- a/lisp/erc/ChangeLog.01	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/erc/ChangeLog.01	Sun Feb 11 01:18:25 2007 +0000
@@ -1036,8 +1036,23 @@
 	* erc-speak.el 1.1, erc.el 1.1: New file.
 
     Copyright (C) 2001, 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.
 
 ;; Local Variables:
 ;; coding: utf-8
--- a/lisp/erc/ChangeLog.02	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/erc/ChangeLog.02	Sun Feb 11 01:18:25 2007 +0000
@@ -2597,8 +2597,23 @@
 See ChangeLog.01 for earlier changes.
 
     Copyright (C) 2002, 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.
 
 ;; Local Variables:
 ;; coding: utf-8
--- a/lisp/erc/ChangeLog.03	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/erc/ChangeLog.03	Sun Feb 11 01:18:25 2007 +0000
@@ -2141,8 +2141,23 @@
 See ChangeLog.02 for earlier changes.
 
     Copyright (C) 2003, 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.
 
 ;; Local Variables:
 ;; coding: utf-8
--- a/lisp/erc/ChangeLog.04	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/erc/ChangeLog.04	Sun Feb 11 01:18:25 2007 +0000
@@ -2070,8 +2070,23 @@
 See ChangeLog.03 for earlier changes.
 
     Copyright (C) 2004, 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.
 
 ;; Local Variables:
 ;; coding: utf-8
--- a/lisp/erc/ChangeLog.05	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/erc/ChangeLog.05	Sun Feb 11 01:18:25 2007 +0000
@@ -1218,8 +1218,23 @@
 See ChangeLog.04 for earlier changes.
 
     Copyright (C) 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.
 
 ;; Local Variables:
 ;; coding: utf-8
--- a/lisp/gnus/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/gnus/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -4734,8 +4734,23 @@
 See ChangeLog.2 for earlier changes.
 
     Copyright (C) 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.
 
 ;; Local Variables:
 ;; coding: iso-2022-7bit
--- a/lisp/gnus/ChangeLog.1	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/gnus/ChangeLog.1	Sun Feb 11 01:18:25 2007 +0000
@@ -3727,8 +3727,23 @@
 
 
     Copyright (C) 1997, 1998, 1999, 2000, 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.
+      2005, 2006, 2007 Free Software Foundation, Inc.
+
+  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: c2f4e9c8-94fb-4c63-bdfd-4ab680cc9db7
--- a/lisp/gnus/ChangeLog.2	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/gnus/ChangeLog.2	Sun Feb 11 01:18:25 2007 +0000
@@ -18858,9 +18858,24 @@
 See ChangeLog.1 for earlier changes.
 
     Copyright (C) 2000, 2001, 2002, 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.
+      Free Software Foundation, Inc.
+
+  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.
 
 ;; Local Variables:
 ;; coding: iso-2022-7bit
--- a/lisp/mh-e/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/mh-e/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -2870,9 +2870,22 @@
 
   Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
 
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty 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.
 
 ;; Local Variables:
 ;; sentence-end-double-space: nil
--- a/lisp/mh-e/ChangeLog.1	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/mh-e/ChangeLog.1	Sun Feb 11 01:18:25 2007 +0000
@@ -11409,8 +11409,21 @@
 
   Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty 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: 2577172b-b1bf-4d87-acfb-c9d8780e8851
--- a/lisp/url/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/url/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -1782,7 +1782,22 @@
 
     Copyright (C) 1999, 2001, 2002, 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: ac117078-3091-4533-be93-098162ac2926
--- a/lispintro/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/lispintro/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -237,7 +237,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: ee4f8e1f-e14c-4d2e-86de-4dd697e6f1c3
--- a/lispintro/README	Sun Feb 11 01:14:59 2007 +0000
+++ b/lispintro/README	Sun Feb 11 01:18:25 2007 +0000
@@ -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 of the "Introduction to Programming
@@ -65,3 +64,21 @@
 
 2006 Oct 31
 Robert J. Chassell, bob@gnu.org
+
+
+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.
--- a/lispref/ChangeLog	Sun Feb 11 01:14:59 2007 +0000
+++ b/lispref/ChangeLog	Sun Feb 11 01:18:25 2007 +0000
@@ -5646,7 +5646,22 @@
 
     Copyright (C) 1998, 1999, 2000, 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: 985ae0ce-df29-475b-b3f8-4bbcbf6f7fda
--- a/lispref/README	Sun Feb 11 01:14:59 2007 +0000
+++ b/lispref/README	Sun Feb 11 01:18:25 2007 +0000
@@ -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.
 
 
 README for Edition 2.9 of the Emacs Lisp Reference Manual.
@@ -53,3 +52,21 @@
 ** To make an Info file, you need to install Texinfo, then run
 `./configure' and `make info'.  To install the Info files, run
 `make install'.
+
+
+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.