Switch license to GPLv3 or later.

22 files changed, 24 insertions, 24 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 56ca9da1bbe..7a0786a6414 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1393,7 +1393,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/nt/INSTALL b/nt/INSTALL
index 489941e1578..a6fe79d826f 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -453,7 +453,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/nt/README b/nt/README
index 556db89b100..b452fedd1f5 100644
--- a/nt/README
+++ b/nt/README
@@ -74,7 +74,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/nt/addpm.c b/nt/addpm.c
index 32b4bd6b532..a2ad06149b2 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -6,7 +6,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/nt/addsection.c b/nt/addsection.c
index 055240ac715..c79bbbbadfd 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -6,7 +6,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/nt/cmdproxy.c b/nt/cmdproxy.c
index d01e7f39724..3f3e639d8f7 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -17,7 +17,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/nt/config.nt b/nt/config.nt
index 4a0d6897b05..fb33f2797c7 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -6,7 +6,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/nt/configure.bat b/nt/configure.bat
index 2ff90186445..5ff084832dd 100755
--- a/nt/configure.bat
+++ b/nt/configure.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/nt/ddeclient.c b/nt/ddeclient.c
index f2efdfd903b..01f00c83316 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -6,7 +6,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/nt/envadd.bat b/nt/envadd.bat
index 16e653d4a88..a2b7194c716 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -7,7 +7,7 @@ rem  This file is part of GNU Emacs.
 rem

 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

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

diff --git a/nt/gmake.defs b/nt/gmake.defs
index c08ca32200f..51b4756995d 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -4,7 +4,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/nt/icons/README b/nt/icons/README
index a11ffba6ed3..4cb7d87f470 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -3,7 +3,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 File: emacs.ico
 Author: Andrew Zhilin
 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)
 
 
 Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
@@ -13,7 +13,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
 Author: Rob Davenport <rgd at bigfoot.com>
 Copyright (C) 1999, 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)
 
   <http://users.adelphia.net/~rob.davenport/gnuicons.html>
   "These are some images of a 3D stylized gnu head that I created back
@@ -30,4 +30,4 @@ Tuomas Kuosmanen, Rodney Dawes, Jakub Steiner, Alexander Larsson, 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
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index 1ccc4c4eb74..6cadc106d11 100755
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -5,7 +5,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/nt/inc/langinfo.h b/nt/inc/langinfo.h
index b445ff0caa2..4961fba431d 100644
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -5,7 +5,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/nt/inc/nl_types.h b/nt/inc/nl_types.h
index ce0e54bfcee..0b37e8584e7 100644
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -5,7 +5,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/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 0923dd9246b..5050720a3f4 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -5,7 +5,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/nt/makefile.w32-in b/nt/makefile.w32-in
index 69d53b357ae..e7a10698ea2 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -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/nt/multi-install-info.bat b/nt/multi-install-info.bat
index 2ee5879f11d..8266c903aaa 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -9,7 +9,7 @@ rem  This file is part of GNU Emacs.
 rem

 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

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

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 03ae2f851fa..2a69c0ed3a5 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -4,7 +4,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/nt/paths.h b/nt/paths.h
index d2077d90df4..9fb76cc78c4 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -5,7 +5,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/nt/preprep.c b/nt/preprep.c
index 7fedd9b8df2..4978c314861 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -6,7 +6,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/nt/runemacs.c b/nt/runemacs.c
index 6b6b84e33be..643b8036827 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -5,7 +5,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,