# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1185346051 0
# Node ID 713172dcf518c9ec5a6039a1696c87db5bff20e7
# Parent  cea60c1e501a2a141764cba1155b85d02739a544
Switch license to GPLv3 or later.

diff -r cea60c1e501a -r 713172dcf518 etc/ChangeLog
--- a/etc/ChangeLog	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/ChangeLog	Wed Jul 25 06:47:31 2007 +0000
@@ -3620,7 +3620,7 @@
 
   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)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/DEBUG
--- a/etc/DEBUG	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/DEBUG	Wed Jul 25 06:47:31 2007 +0000
@@ -748,7 +748,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/DISTRIB
--- a/etc/DISTRIB	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/DISTRIB	Wed Jul 25 06:47:31 2007 +0000
@@ -101,7 +101,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/ERC-NEWS
--- a/etc/ERC-NEWS	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/ERC-NEWS	Wed Jul 25 06:47:31 2007 +0000
@@ -1089,7 +1089,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/ETAGS.EBNF
--- a/etc/ETAGS.EBNF	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/ETAGS.EBNF	Wed Jul 25 06:47:31 2007 +0000
@@ -101,8 +101,8 @@
 
     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.
+    the Free Software Foundation; either version 3, 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
@@ -110,5 +110,6 @@
     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
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.
diff -r cea60c1e501a -r 713172dcf518 etc/ETAGS.README
--- a/etc/ETAGS.README	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/ETAGS.README	Wed Jul 25 06:47:31 2007 +0000
@@ -36,8 +36,8 @@
 
 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 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, 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
@@ -45,5 +45,6 @@
 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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
+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.
diff -r cea60c1e501a -r 713172dcf518 etc/GNUS-NEWS
--- a/etc/GNUS-NEWS	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/GNUS-NEWS	Wed Jul 25 06:47:31 2007 +0000
@@ -524,7 +524,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/HELLO
--- a/etc/HELLO	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/HELLO	Wed Jul 25 06:47:31 2007 +0000
@@ -70,7 +70,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/MACHINES
--- a/etc/MACHINES	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/MACHINES	Wed Jul 25 06:47:31 2007 +0000
@@ -1506,7 +1506,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/MH-E-NEWS
--- a/etc/MH-E-NEWS	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/MH-E-NEWS	Wed Jul 25 06:47:31 2007 +0000
@@ -3122,7 +3122,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/MORE.STUFF
--- a/etc/MORE.STUFF	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/MORE.STUFF	Wed Jul 25 06:47:31 2007 +0000
@@ -284,7 +284,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/Makefile
--- a/etc/Makefile	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/Makefile	Wed Jul 25 06:47:31 2007 +0000
@@ -7,7 +7,7 @@
 
 ## 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)
+## the Free Software Foundation; either version 3, or (at your option)
 ## any later version.
 
 ## GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/NEWS
--- a/etc/NEWS	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/NEWS	Wed Jul 25 06:47:31 2007 +0000
@@ -5419,7 +5419,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/NEWS.1-17
--- a/etc/NEWS.1-17	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/NEWS.1-17	Wed Jul 25 06:47:31 2007 +0000
@@ -2515,7 +2515,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/NEWS.18
--- a/etc/NEWS.18	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/NEWS.18	Wed Jul 25 06:47:31 2007 +0000
@@ -1605,7 +1605,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/NEWS.19
--- a/etc/NEWS.19	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/NEWS.19	Wed Jul 25 06:47:31 2007 +0000
@@ -6524,7 +6524,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/NEWS.20
--- a/etc/NEWS.20	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/NEWS.20	Wed Jul 25 06:47:31 2007 +0000
@@ -4498,7 +4498,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/NEWS.21
--- a/etc/NEWS.21	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/NEWS.21	Wed Jul 25 06:47:31 2007 +0000
@@ -4885,7 +4885,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/PROBLEMS
--- a/etc/PROBLEMS	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/PROBLEMS	Wed Jul 25 06:47:31 2007 +0000
@@ -3863,7 +3863,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/README
--- a/etc/README	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/README	Wed Jul 25 06:47:31 2007 +0000
@@ -40,7 +40,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/TERMS
--- a/etc/TERMS	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/TERMS	Wed Jul 25 06:47:31 2007 +0000
@@ -237,8 +237,8 @@
 
     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.
+    the Free Software Foundation; either version 3, 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
@@ -246,5 +246,6 @@
     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
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.
diff -r cea60c1e501a -r 713172dcf518 etc/TODO
--- a/etc/TODO	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/TODO	Wed Jul 25 06:47:31 2007 +0000
@@ -605,7 +605,7 @@
 
 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/TUTORIAL
--- a/etc/TUTORIAL	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/TUTORIAL	Wed Jul 25 06:47:31 2007 +0000
@@ -1111,7 +1111,7 @@
   
   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)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
   
   GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/calccard.tex
--- a/etc/calccard.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/calccard.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -20,7 +20,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/compilation.txt
--- a/etc/compilation.txt	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/compilation.txt	Wed Jul 25 06:47:31 2007 +0000
@@ -413,8 +413,8 @@
 
     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.
+    the Free Software Foundation; either version 3, 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
@@ -422,5 +422,6 @@
     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
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.
diff -r cea60c1e501a -r 713172dcf518 etc/cs-dired-ref.tex
--- a/etc/cs-dired-ref.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/cs-dired-ref.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -9,7 +9,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/cs-refcard.tex
--- a/etc/cs-refcard.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/cs-refcard.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -18,7 +18,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/cs-survival.tex
--- a/etc/cs-survival.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/cs-survival.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -28,7 +28,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/de-refcard.tex
--- a/etc/de-refcard.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/de-refcard.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -30,7 +30,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/dired-ref.tex
--- a/etc/dired-ref.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/dired-ref.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -6,7 +6,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/edt-user.doc
--- a/etc/edt-user.doc	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/edt-user.doc	Wed Jul 25 06:47:31 2007 +0000
@@ -13,7 +13,7 @@
 
 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.
+Foundation; either version 3, 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
@@ -832,7 +832,7 @@
 
 ;; 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)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/emacs-buffer.gdb
--- a/etc/emacs-buffer.gdb	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/emacs-buffer.gdb	Wed Jul 25 06:47:31 2007 +0000
@@ -13,7 +13,7 @@
 #
 # 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/emacs.1
--- a/etc/emacs.1	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/emacs.1	Wed Jul 25 06:47:31 2007 +0000
@@ -6,7 +6,7 @@
 .\"
 .\" 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)
+.\" the Free Software Foundation; either version 3, or (at your option)
 .\" any later version.
 .\"
 .\" GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/emacs.bash
--- a/etc/emacs.bash	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/emacs.bash	Wed Jul 25 06:47:31 2007 +0000
@@ -9,7 +9,7 @@
 
 ## 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)
+## the Free Software Foundation; either version 3, or (at your option)
 ## any later version.
 
 ## GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/emacs.py
--- a/etc/emacs.py	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/emacs.py	Wed Jul 25 06:47:31 2007 +0000
@@ -7,7 +7,7 @@
 
 # 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/enriched.doc
--- a/etc/enriched.doc	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/enriched.doc	Wed Jul 25 06:47:31 2007 +0000
@@ -263,8 +263,8 @@
 
     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.
+    the Free Software Foundation; either version 3, 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
@@ -272,6 +272,6 @@
     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
-
+    along with this program; see the file COPYING.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+    Boston, MA 02110-1301 USA.
diff -r cea60c1e501a -r 713172dcf518 etc/fr-drdref.tex
--- a/etc/fr-drdref.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/fr-drdref.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -6,7 +6,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/fr-refcard.tex
--- a/etc/fr-refcard.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/fr-refcard.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -21,7 +21,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/fr-survival.tex
--- a/etc/fr-survival.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/fr-survival.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -29,7 +29,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/gnus-tut.txt
--- a/etc/gnus-tut.txt	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/gnus-tut.txt	Wed Jul 25 06:47:31 2007 +0000
@@ -34,7 +34,7 @@
 
 ;; 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)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/orgcard.tex
--- a/etc/orgcard.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/orgcard.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -25,7 +25,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/pl-refcard.tex
--- a/etc/pl-refcard.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/pl-refcard.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -39,7 +39,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/ps-prin0.ps
--- a/etc/ps-prin0.ps	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/ps-prin0.ps	Wed Jul 25 06:47:31 2007 +0000
@@ -8,7 +8,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/ps-prin1.ps
--- a/etc/ps-prin1.ps	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/ps-prin1.ps	Wed Jul 25 06:47:31 2007 +0000
@@ -8,7 +8,7 @@
 %
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/pt-br-refcard.tex
--- a/etc/pt-br-refcard.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/pt-br-refcard.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -21,7 +21,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/refcard.tex
--- a/etc/refcard.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/refcard.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -21,7 +21,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/ses-example.ses
--- a/etc/ses-example.ses	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/ses-example.ses	Wed Jul 25 06:47:31 2007 +0000
@@ -213,8 +213,8 @@
 ;;; 
 ;;;   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.
+;;;   the Free Software Foundation; either version 3, 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
@@ -222,8 +222,8 @@
 ;;;   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
-
+;;;   along with this program; see the file COPYING.  If not, write to the 
+;;;   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+;;;   Boston, MA 02110-1301, USA.
 
 ;;; arch-tag: 4fcb0843-e3f9-4270-b8fb-998129190765
diff -r cea60c1e501a -r 713172dcf518 etc/sk-dired-ref.tex
--- a/etc/sk-dired-ref.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/sk-dired-ref.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -9,7 +9,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/sk-refcard.tex
--- a/etc/sk-refcard.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/sk-refcard.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -18,7 +18,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/sk-survival.tex
--- a/etc/sk-survival.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/sk-survival.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -28,7 +28,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/splash.xpm
--- a/etc/splash.xpm	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/splash.xpm	Wed Jul 25 06:47:31 2007 +0000
@@ -10,7 +10,7 @@
  *
  * 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)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/splash8.xpm
--- a/etc/splash8.xpm	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/splash8.xpm	Wed Jul 25 06:47:31 2007 +0000
@@ -10,7 +10,7 @@
  *
  * 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)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * GNU Emacs is distributed in the hope that it will be useful,
diff -r cea60c1e501a -r 713172dcf518 etc/survival.tex
--- a/etc/survival.tex	Wed Jul 25 06:43:56 2007 +0000
+++ b/etc/survival.tex	Wed Jul 25 06:47:31 2007 +0000
@@ -32,7 +32,7 @@
 
 % 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)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,