Switch license to GPLv3 or later.

70 files changed, 100 insertions, 96 deletions

diff --git a/CONTRIBUTE b/CONTRIBUTE
index 0f7fe6855b5..8d48ea8f985 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -207,7 +207,7 @@ 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)
+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 --git a/ChangeLog b/ChangeLog
index c53ed83f067..4827a53d16e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6482,7 +6482,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 --git a/INSTALL b/INSTALL
index 80ee412543b..9f754a05cb3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -911,7 +911,7 @@ 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)
+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 --git a/INSTALL.CVS b/INSTALL.CVS
index 7e785fcac0d..efd8618ca46 100644
--- a/INSTALL.CVS
+++ b/INSTALL.CVS
@@ -88,7 +88,7 @@ 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)
+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 --git a/Makefile.in b/Makefile.in
index 91bf7e935fa..2959c9d7e12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 --git a/README b/README
index a0bc92d58d2..a63bff17ea7 100644
--- a/README
+++ b/README
@@ -98,7 +98,7 @@ 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)
+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 --git a/config.bat b/config.bat
index 9e56b782256..1f544d3e274 100644
--- a/config.bat
+++ b/config.bat
@@ -8,7 +8,7 @@ rem   This file is part of GNU Emacs.
 

 rem   GNU Emacs is free software; you can redistribute it and/or modify

 rem   it under the terms of the GNU General Public License as published by

-rem   the Free Software Foundation; either version 2, or (at your option)

+rem   the Free Software Foundation; either version 3, or (at your option)

 rem   any later version.

 

 rem   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/configure.in b/configure.in
index a5033e96247..eed8891aa5c 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ dnl  This file is part of GNU Emacs.
 dnl
 dnl  GNU Emacs is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
-dnl  the Free Software Foundation; either version 2, or (at your option)
+dnl  the Free Software Foundation; either version 3, or (at your option)
 dnl  any later version.
 dnl
 dnl  GNU Emacs is distributed in the hope that it will be useful,
@@ -2945,7 +2945,7 @@ 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)
+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 --git a/etc/ChangeLog b/etc/ChangeLog
index 1adcd0e59db..f59e91a209a 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -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 --git a/etc/DEBUG b/etc/DEBUG
index ea4e14866ca..ca9b08874c0 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -748,7 +748,7 @@ 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)
+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 --git a/etc/DISTRIB b/etc/DISTRIB
index 33bc767df79..945205df29f 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -101,7 +101,7 @@ 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)
+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 --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index e7b0dcb81bf..f5bf1e89dde 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1089,7 +1089,7 @@ 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)
+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 --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF
index 1ac66899236..002747a630a 100644
--- a/etc/ETAGS.EBNF
+++ b/etc/ETAGS.EBNF
@@ -101,8 +101,8 @@ COPYING PERMISSIONS:
 
     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 @@ COPYING PERMISSIONS:
     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 --git a/etc/ETAGS.README b/etc/ETAGS.README
index aef3aa67f51..e05735f03c1 100644
--- a/etc/ETAGS.README
+++ b/etc/ETAGS.README
@@ -36,8 +36,8 @@ This file is not considered part of GNU Emacs.
 
 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 @@ 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 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 --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index d5727174856..fce326fc0d0 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -524,7 +524,7 @@ 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)
+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 --git a/etc/HELLO b/etc/HELLO
index 8e7b5496c63..d803e7944d4 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -70,7 +70,7 @@ 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)
+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 --git a/etc/MACHINES b/etc/MACHINES
index 83723fccbbc..a4db1df76c7 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -1506,7 +1506,7 @@ 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)
+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 --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 496f5813b93..65ccc760076 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3122,7 +3122,7 @@ 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)
+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 --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 43ecfd31a62..bd2a4573bac 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -284,7 +284,7 @@ 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)
+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 --git a/etc/Makefile b/etc/Makefile
index 1947147dad7..4608ea2c93d 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -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 --git a/etc/NEWS b/etc/NEWS
index 1ea5d4e1da4..47ac7539122 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -5419,7 +5419,7 @@ 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)
+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 --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index a69ac834730..4e5243ea0c4 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -2515,7 +2515,7 @@ 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)
+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 --git a/etc/NEWS.18 b/etc/NEWS.18
index d7722f98d0d..8038e052e7b 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -1605,7 +1605,7 @@ 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)
+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 --git a/etc/NEWS.19 b/etc/NEWS.19
index 85414f6f075..2f3e83fb946 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -6524,7 +6524,7 @@ 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)
+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 --git a/etc/NEWS.20 b/etc/NEWS.20
index ad101000f16..0c9e7d4948c 100644
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -4498,7 +4498,7 @@ 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)
+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 --git a/etc/NEWS.21 b/etc/NEWS.21
index 476853746f5..91a37be8276 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -4885,7 +4885,7 @@ 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)
+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 --git a/etc/PROBLEMS b/etc/PROBLEMS
index a40c9a890e0..fbc5e8cb91a 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3863,7 +3863,7 @@ 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)
+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 --git a/etc/README b/etc/README
index d8ca8a7b947..05e1e63d8d5 100644
--- a/etc/README
+++ b/etc/README
@@ -40,7 +40,7 @@ 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)
+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 --git a/etc/TERMS b/etc/TERMS
index 926d6130aae..c26c38ab6e4 100644
--- a/etc/TERMS
+++ b/etc/TERMS
@@ -237,8 +237,8 @@ COPYING PERMISSIONS:
 
     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 @@ COPYING PERMISSIONS:
     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 --git a/etc/TODO b/etc/TODO
index 50fb4a19484..c81b82dd54a 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -605,7 +605,7 @@ 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)
+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 --git a/etc/TUTORIAL b/etc/TUTORIAL
index d842870975e..eaa97619763 100644
--- a/etc/TUTORIAL
+++ b/etc/TUTORIAL
@@ -1111,7 +1111,7 @@ and comes with permission to distribute copies on certain conditions:
   
   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 --git a/etc/TUTORIAL.eo b/etc/TUTORIAL.eo
index c5a4ab19df0..1f6e2d87880 100644
--- a/etc/TUTORIAL.eo
+++ b/etc/TUTORIAL.eo
@@ -1096,7 +1096,7 @@ kondiæoj estas observataj:
  
    "GNU Emacs" estas libera programverko; vi povas øin pludistribui
    kaj/aý modifi je la kondiæoj de la GNUa Øenerala Publika Permesilo,
-   eldonita de "Free Software Foundation", laý la versio 2 de tiu
+   eldonita de "Free Software Foundation", laý la versio 3 de tiu
    Permesilo aý, se vi preferas, ajna posta versio.
  
    Ni distribuas æi tiun programon esperante ke øi estos utila, tamen
diff --git a/etc/calccard.tex b/etc/calccard.tex
index dec07c4705d..f2f033cc7e1 100644
--- a/etc/calccard.tex
+++ b/etc/calccard.tex
@@ -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 --git a/etc/compilation.txt b/etc/compilation.txt
index 933b486bb0f..c35ab96dcb5 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -413,8 +413,8 @@ COPYING PERMISSIONS:
 
     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 @@ COPYING PERMISSIONS:
     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 --git a/etc/cs-dired-ref.tex b/etc/cs-dired-ref.tex
index e78bf29b973..c936ab0eedf 100644
--- a/etc/cs-dired-ref.tex
+++ b/etc/cs-dired-ref.tex
@@ -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 --git a/etc/cs-refcard.tex b/etc/cs-refcard.tex
index 9b5b689f66d..c9742eed0eb 100644
--- a/etc/cs-refcard.tex
+++ b/etc/cs-refcard.tex
@@ -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 --git a/etc/cs-survival.tex b/etc/cs-survival.tex
index 20a88118481..25f2786103f 100644
--- a/etc/cs-survival.tex
+++ b/etc/cs-survival.tex
@@ -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 --git a/etc/de-refcard.tex b/etc/de-refcard.tex
index 94f9bf0dc47..76de0410b52 100644
--- a/etc/de-refcard.tex
+++ b/etc/de-refcard.tex
@@ -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 --git a/etc/dired-ref.tex b/etc/dired-ref.tex
index 061c1415ec2..45c1e8fc14f 100644
--- a/etc/dired-ref.tex
+++ b/etc/dired-ref.tex
@@ -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 --git a/etc/edt-user.doc b/etc/edt-user.doc
index c99bb83a364..d4aaab8b492 100644
--- a/etc/edt-user.doc
+++ b/etc/edt-user.doc
@@ -13,7 +13,7 @@ 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.
+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 @@ G-C-\: Split Window                     |  FNDNXT  |   Yank   |   CUT    |
 
 ;; 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 --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb
index 6a6a73ca0b6..76586e2aff7 100644
--- a/etc/emacs-buffer.gdb
+++ b/etc/emacs-buffer.gdb
@@ -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 --git a/etc/emacs.1 b/etc/emacs.1
index daee15b2388..87a382272c5 100644
--- a/etc/emacs.1
+++ b/etc/emacs.1
@@ -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 --git a/etc/emacs.bash b/etc/emacs.bash
index 2589c784a87..c207e5ffe9e 100644
--- a/etc/emacs.bash
+++ b/etc/emacs.bash
@@ -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 --git a/etc/emacs.py b/etc/emacs.py
index 0d0f2e75ed3..f11913cd7b5 100644
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -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 --git a/etc/enriched.doc b/etc/enriched.doc
index 25b034434ad..50dcf0bdac4 100644
--- a/etc/enriched.doc
+++ b/etc/enriched.doc
@@ -263,8 +263,8 @@ COPYING PERMISSIONS:
 
     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 @@ COPYING PERMISSIONS:
     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 --git a/etc/fr-drdref.tex b/etc/fr-drdref.tex
index 9ae872b99d2..e768a521203 100644
--- a/etc/fr-drdref.tex
+++ b/etc/fr-drdref.tex
@@ -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 --git a/etc/fr-refcard.tex b/etc/fr-refcard.tex
index 1e399334b90..202f5d483d2 100644
--- a/etc/fr-refcard.tex
+++ b/etc/fr-refcard.tex
@@ -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 --git a/etc/fr-survival.tex b/etc/fr-survival.tex
index ce338219128..e39f23bf05b 100644
--- a/etc/fr-survival.tex
+++ b/etc/fr-survival.tex
@@ -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 --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt
index 0505b49f10b..9e7ff793d73 100644
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -34,7 +34,7 @@ heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
 
 ;; 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 --git a/etc/images/README b/etc/images/README
index 4d2056b27ac..8838c5aae8c 100644
--- a/etc/images/README
+++ b/etc/images/README
@@ -21,7 +21,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 File: mh-logo.xpm
 Author: Satyaki Das
 Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
 
 The following icons are from GTK+ 2.x and GNOME 2.x.  They are not
@@ -32,7 +32,7 @@ part of Emacs, but distributed and used by Emacs.
   Tor Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
   Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
   Pesenti Gritti
-  License: GNU General Public License version 2 (see COPYING)
+  License: GNU General Public License version 2
 
 * From GTK+ 2.x:
 
diff --git a/etc/images/ezimage/README b/etc/images/ezimage/README
index a0feb84724c..694e2abd2e1 100644
--- a/etc/images/ezimage/README
+++ b/etc/images/ezimage/README
@@ -9,4 +9,4 @@ Files: bits.xpm bitsbang.xpm box-minus.xpm box-plus.xpm
 Author: Eric M. Ludlam
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/gnus/README b/etc/images/gnus/README
index cab6770202d..09208d3d11d 100644
--- a/etc/images/gnus/README
+++ b/etc/images/gnus/README
@@ -4,7 +4,7 @@ Files: important.xpm, unimportant.xpm
 Author: Simon Josefsson <simon@josefsson.org>
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
 Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
   describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm
@@ -20,7 +20,7 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
 Author: Luis Fernandes <elf@ee.ryerson.ca>
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
 The following icons are from GNOME 2.x. They are not part of Emacs,
 but distributed and used by Emacs.
@@ -30,7 +30,7 @@ but distributed and used by Emacs.
   Tor Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
   Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
   Pesenti Gritti
-  License: GNU General Public License version 2 (see COPYING)
+  License: GNU General Public License version 2
 
 toggle-subscription.xpm       (GNOME stock/document/stock_task-recurring)
 kill-group.pbm and kill-group.xpm are converted from close.xpm
diff --git a/etc/images/gud/README b/etc/images/gud/README
index a05351e7b82..6ed677eebce 100644
--- a/etc/images/gud/README
+++ b/etc/images/gud/README
@@ -3,7 +3,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 The following icons were created by Nick Roberts <nickrob@snap.net.nz>.
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
   
   break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm
   break.xpm, nexti.xpm, go.xpm, pp.xpm, print.xpm, pstar.xpm, remove.xpm
@@ -33,7 +33,7 @@ set in src/gdb/gdbtk/library/images2.
 
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
   cont.pbm and cont.xpm were converted from continue.gif
   down.pbm and down.xpm were converted from down.gif
diff --git a/etc/images/icons/README b/etc/images/icons/README
index ec20a6d510f..ff53516acce 100644
--- a/etc/images/icons/README
+++ b/etc/images/icons/README
@@ -3,4 +3,4 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png
 Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
 Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/smilies/README b/etc/images/smilies/README
index 50725813acb..e865f959e01 100644
--- a/etc/images/smilies/README
+++ b/etc/images/smilies/README
@@ -5,4 +5,4 @@ Authors: Reiner Steib, Simon Josefsson, Kai Grossjohann, Alex
          Schroeder, Oliver Scholz, Per Abrahamsen, Kim F. Storm.
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index 55a797000c6..1207fadc76b 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -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 --git a/etc/pl-refcard.tex b/etc/pl-refcard.tex
index 2f55402aa3d..43f583b8e75 100644
--- a/etc/pl-refcard.tex
+++ b/etc/pl-refcard.tex
@@ -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 --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps
index ffa7d39dfe7..97c396993cd 100644
--- a/etc/ps-prin0.ps
+++ b/etc/ps-prin0.ps
@@ -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 --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index 977b2e91f15..15fe022ed76 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -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 --git a/etc/pt-br-refcard.tex b/etc/pt-br-refcard.tex
index 945fce4e47a..6492ce55c10 100644
--- a/etc/pt-br-refcard.tex
+++ b/etc/pt-br-refcard.tex
@@ -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 --git a/etc/refcard.tex b/etc/refcard.tex
index 7f7784bc957..9ee88261ca5 100644
--- a/etc/refcard.tex
+++ b/etc/refcard.tex
@@ -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 --git a/etc/ses-example.ses b/etc/ses-example.ses
index 3cbeb587b19..6155483e29d 100644
--- a/etc/ses-example.ses
+++ b/etc/ses-example.ses
@@ -213,8 +213,8 @@ Sales summary - Acme fundraising
 ;;; 
 ;;;   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 @@ Sales summary - Acme fundraising
 ;;;   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 --git a/etc/sk-dired-ref.tex b/etc/sk-dired-ref.tex
index fbc8f4cdd49..e00de765241 100644
--- a/etc/sk-dired-ref.tex
+++ b/etc/sk-dired-ref.tex
@@ -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 --git a/etc/sk-refcard.tex b/etc/sk-refcard.tex
index 1182e50b82d..be5b57b8405 100644
--- a/etc/sk-refcard.tex
+++ b/etc/sk-refcard.tex
@@ -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 --git a/etc/sk-survival.tex b/etc/sk-survival.tex
index 658e501b063..61d549e1b5b 100644
--- a/etc/sk-survival.tex
+++ b/etc/sk-survival.tex
@@ -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 --git a/etc/splash.xpm b/etc/splash.xpm
index 85171f30725..741deeac31c 100644
--- a/etc/splash.xpm
+++ b/etc/splash.xpm
@@ -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 --git a/etc/splash8.xpm b/etc/splash8.xpm
index 236d07c6a1c..1c209585739 100644
--- a/etc/splash8.xpm
+++ b/etc/splash8.xpm
@@ -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 --git a/etc/survival.tex b/etc/survival.tex
index 59583430896..45662ecc4ea 100644
--- a/etc/survival.tex
+++ b/etc/survival.tex
@@ -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,
diff --git a/etc/tree-widget/default/README b/etc/tree-widget/default/README
index e8ef58fe925..d8cc1c6efbb 100644
--- a/etc/tree-widget/default/README
+++ b/etc/tree-widget/default/README
@@ -6,4 +6,4 @@ Files: close.png close.xpm empty.png empty.xpm end-guide.png end-guide.xpm
        open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
 Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/tree-widget/folder/README b/etc/tree-widget/folder/README
index 2a5d156e70e..e611050b088 100644
--- a/etc/tree-widget/folder/README
+++ b/etc/tree-widget/folder/README
@@ -6,4 +6,4 @@ Files:  close.png close.xpm empty.png empty.xpm end-guide.png
         no-handle.xpm open.png open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
 Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)