Switch to standard GPL text for license.

20 files changed, 383 insertions, 215 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 9cf2cb5fdc2..8d8f126277a 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -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
diff --git a/etc/DEBUG b/etc/DEBUG
index 50171964a59..ad59d48b3ca 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -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 @@ and look at those registers directly, to see the actual current values
 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: "[ 	]*$"
diff --git a/etc/DISTRIB b/etc/DISTRIB
index 414e35e426e..33bc767df79 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -4,12 +4,11 @@ the USA, see http://www.gnu.org/order/order.html.
 
 	   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 @@ above).
 			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.
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 16b3d5eb161..dd5c113c195 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -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 @@ Same applies to timestamps.  You no longer need to (require
 '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
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index 406858f7fc6..d5727174856 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -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 @@ A new command which starts Gnus offline in slave mode.
 * 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.
+
+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 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.
+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.
 
-   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.
 
 Local variables:
 mode: outline
diff --git a/etc/HELLO b/etc/HELLO
index 45156f245e9..8e7b5496c63 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -64,24 +64,24 @@ Korean ($(CGQ1[(B)	$(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B
 
 
 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.
-
-    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
+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:
 ;;; tab-width: 32
diff --git a/etc/MACHINES b/etc/MACHINES
index 0b55a6f3355..3323c0b98b5 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -2,7 +2,7 @@ Emacs machines list
 
 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 @@ mode: indented-text
 fill-prefix: "  "
 End:
 
-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.
-
+
+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: 7d2e93c7-e982-40ec-9055-3cd064042473
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 70cbb5437c4..496f5813b93 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -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 @@ doesn't find `in-reply-to:'.
 *** `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: "[ 	]*$"
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index d835b1f03ad..653ea68441b 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -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 @@ mode: view
 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
diff --git a/etc/NEWS b/etc/NEWS
index a9ffe23d318..d29a7bee5fa 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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 @@ an error if the argument actually returns differing values.
 
 
 ----------------------------------------------------------------------
-Copyright information:
+This file is part of GNU Emacs.
 
-Copyright (C) 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.
+
+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 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.
+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.
 
-   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.
 
 Local variables:
 mode: outline
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index cb8e28d5f96..a69ac834730 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -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 @@ Lisp programming changes
 
 
 ----------------------------------------------------------------------
-Copyright information:
+This file is part of GNU Emacs.
 
-Copyright (C) 1985, 1986, 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.
+
+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 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.
+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.
 
-   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.
 
 Local variables:
 mode: text
diff --git a/etc/NEWS.18 b/etc/NEWS.18
index ed2abdd7bd0..d7722f98d0d 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -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 @@ C_SWITCH_MACHINE can be defined by the m- file to specify extra `cc' switches.
 
 
 ----------------------------------------------------------------------
-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.
+
+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 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.
+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.
 
-   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.
 
 Local variables:
 mode: text
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 0b72289dc43..459148c38ce 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -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 @@ the tar file.
 
 
 ----------------------------------------------------------------------
-Copyright information:
+This file is part of GNU Emacs.
 
-Copyright (C) 1993, 1994, 1995, 2001, 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.
+
+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 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.
+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.
 
-   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.
 
 Local variables:
 mode: outline
diff --git a/etc/NEWS.20 b/etc/NEWS.20
index ae48b3eb27f..ad101000f16 100644
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -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 @@ select one of those items.
 
 
 ----------------------------------------------------------------------
-Copyright information:
+This file is part of GNU Emacs.
 
-Copyright (C) 1999, 2000, 2001, 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.
+
+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 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.
+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.
 
-   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.
 
 Local variables:
 mode: outline
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 5c8c9d1d655..476853746f5 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -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 @@ support a vertical-bar cursor).
 
 
 ----------------------------------------------------------------------
-Copyright information:
+This file is part of GNU Emacs.
 
-Copyright (C) 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.
+
+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 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.
+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.
 
-   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.
 
 Local variables:
 mode: outline
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index eb7dffe41ab..08d84d6523e 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -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 @@ This problem will not happen if the m-...h file for your type
 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.
+This file is part of GNU Emacs.
 
-Copying and redistribution of this file with or without modification
-are permitted without royalty provided this notice is preserved.
+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: "[ 	]*$"
diff --git a/etc/README b/etc/README
index af2f612d84d..e332216911f 100644
--- a/etc/README
+++ b/etc/README
@@ -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 @@ Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm, gnus-logo.eps
     Free Software Foundation, Inc.
   License: GNU General Public License version 2 or later (see COPYING)
 
-
-Copyright (C) 1992, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-Free Software Foundation, Inc.
 
-
-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.
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/etc/TODO b/etc/TODO
index 1ebc7592948..49c3e0a0489 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -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 @@ not be noticed if it appears within a word.
 ** 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
diff --git a/etc/Xkeymap.txt b/etc/Xkeymap.txt
index fa97f7da014..e34d100fb2f 100644
--- a/etc/Xkeymap.txt
+++ b/etc/Xkeymap.txt
@@ -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
diff --git a/etc/emacs.csh b/etc/emacs.csh
index 393b4793bf7..6e3d0f7ddc2 100644
--- a/etc/emacs.csh
+++ b/etc/emacs.csh
@@ -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
-
-# 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
+### 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.
+
+## 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 @@ alias edit 'set emacs_command=("emacs -nw \!*" "fg %emacs" "emacs -i \!* &"\
  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