Switch license to GPLv3 or later.

diff --git a/leim/quail/croatian.el b/leim/quail/croatian.el
index 3d932566e33435e0eccb762ca58c000820e1b8f4..2ce25bfd7d6b6512e979a8ff2415cde3d55fedd0 100644 (file)
--- a/leim/quail/croatian.el
+++ b/leim/quail/croatian.el
@@ -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/leim/quail/georgian.el b/leim/quail/georgian.el
index d207eb11a0df7dfab0112a3d575932b84e16cb17..8efb9f1719cd3e8add729c592123f65efc2131c8 100644 (file)
--- a/leim/quail/georgian.el
+++ b/leim/quail/georgian.el
@@ -10,7 +10,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,

diff --git a/leim/quail/hanja3.el b/leim/quail/hanja3.el
index b3f94b577f464126da7e423fc2ab138a31b1064b..6df0dd684871f5ef2c5c765f22870d78baa18f76 100644 (file)
--- a/leim/quail/hanja3.el
+++ b/leim/quail/hanja3.el
@@ -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/leim/quail/indian.el b/leim/quail/indian.el
index 973c5ff12bbf0df6d063f8aee22abde8a3262335..e8e48fc6063e664e7b30457402097ea8add7e0bd 100644 (file)
--- a/leim/quail/indian.el
+++ b/leim/quail/indian.el
@@ -11,7 +11,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/leim/quail/rfc1345.el b/leim/quail/rfc1345.el
index 7609a625d5c713e05a3b36c8d79987a7f2d77815..6500f2d7eb5e94227b3f11f6a4bcdc3dcfa67250 100644 (file)
Binary files a/leim/quail/rfc1345.el and b/leim/quail/rfc1345.el differ

diff --git a/leim/quail/sgml-input.el b/leim/quail/sgml-input.el
index 1130e5404c63149292d5c3a41602512a7c6c9abd..1aa391adea3f8f8992db797f0a60338a97a4c09e 100644 (file)
--- a/leim/quail/sgml-input.el
+++ b/leim/quail/sgml-input.el
@@ -10,7 +10,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,

diff --git a/leim/quail/sisheng.el b/leim/quail/sisheng.el
index 0db36cb27e205a4bad718d7bce4a521265b8a067..3bd423c1046e6226876c523fe910203b61940501 100644 (file)
--- a/leim/quail/sisheng.el
+++ b/leim/quail/sisheng.el
@@ -8,7 +8,7 @@
 
 ;; 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)
+;; 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,

diff --git a/leim/quail/slovak.el b/leim/quail/slovak.el
index 9a32e52b710fb2bd3c4396c6e14293cbec3539a8..eed2c99bf215b80d9d2fb34c0b71a3ab3dea7b44 100644 (file)
--- a/leim/quail/slovak.el
+++ b/leim/quail/slovak.el
@@ -12,7 +12,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/leim/quail/vntelex.el b/leim/quail/vntelex.el
index 61cf7650304edc9df03cb3090f90fd2019860f7a..f66bba24128d02f056b225c32b2958ae803fd9b0 100644 (file)
--- a/leim/quail/vntelex.el
+++ b/leim/quail/vntelex.el
@@ -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/leim/quail/welsh.el b/leim/quail/welsh.el
index af97d267057ec9c0d424c848d029eb9218ec2011..f77b52fe58fe1d4ad14187a8b5887a2d3952d05c 100644 (file)
--- a/leim/quail/welsh.el
+++ b/leim/quail/welsh.el
@@ -10,7 +10,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,

diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index 37e6f29235322158228670f7b3f61e7c513ab751..84e1ab97099e80e80fa2f01008a598c021fbb4c7 100644 (file)
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -11,7 +11,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/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el
index 3448da812a2999dfb6fd4f0f5347962936fb7bd6..d3c2f623e6692c6756e8a121020f5ea93cb281d8 100644 (file)
--- a/lisp/international/iso-cvt.el
+++ b/lisp/international/iso-cvt.el
@@ -11,7 +11,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/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index 16beb450a31e8883b8d640e51c29a5bd9519bdda..134794e5ede3363b7486a9718bad38705e7c9c84 100644 (file)
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -11,7 +11,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/lisp/international/latexenc.el b/lisp/international/latexenc.el
index e19cff0eacef1a5bd39849fbcf2b36ca0e31395c..57013b5953899eb0a9a95a2a9cdf8ada691981cb 100644 (file)
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -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/lisp/international/latin-1.el b/lisp/international/latin-1.el
index 4c3125655508a51568a6848efc8fecee48a066ad..33acf132a0d4f1890b13f80f09bb6dc3592fda6c 100644 (file)
--- a/lisp/international/latin-1.el
+++ b/lisp/international/latin-1.el
@@ -11,7 +11,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/lisp/international/latin-2.el b/lisp/international/latin-2.el
index 755d845532a52d03a440cdd6e38f6d36459cf545..efb632000399844539079a065869521fc8003899 100644 (file)
--- a/lisp/international/latin-2.el
+++ b/lisp/international/latin-2.el
@@ -12,7 +12,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/lisp/international/latin-3.el b/lisp/international/latin-3.el
index 18f5b07107726ecea0b907bc095813206d7fe9e4..1539206771c524c27de54a70ae77dcb4e47805b8 100644 (file)
--- a/lisp/international/latin-3.el
+++ b/lisp/international/latin-3.el
@@ -11,7 +11,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/lisp/international/latin-4.el b/lisp/international/latin-4.el
index 5fd3767742e21a9da62cb2f48ebf16b766d4d107..e3b9b04e6fbbe6b238ac1c3506dcb27c481868af 100644 (file)
--- a/lisp/international/latin-4.el
+++ b/lisp/international/latin-4.el
@@ -11,7 +11,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/lisp/international/latin-5.el b/lisp/international/latin-5.el
index a36eb89798bf3379ae8abf2e081c9237097b3a6c..97b3e0076e4131a7cd2dcc47c119a74c8be03be8 100644 (file)
--- a/lisp/international/latin-5.el
+++ b/lisp/international/latin-5.el
@@ -11,7 +11,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/lisp/international/latin-8.el b/lisp/international/latin-8.el
index 710784b40fdb6dc74693e52ae0a854d673748c89..0f41d70ece67a52d58e145bf431cabc7c9b4240b 100644 (file)
--- a/lisp/international/latin-8.el
+++ b/lisp/international/latin-8.el
@@ -11,7 +11,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/lisp/international/latin-9.el b/lisp/international/latin-9.el
index c29925f8dc266379d1e4e103ef5d0e4f6d56358e..cb94d756cc2256faa65662da0165778bf94cdc93 100644 (file)
--- a/lisp/international/latin-9.el
+++ b/lisp/international/latin-9.el
@@ -11,7 +11,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/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
index 7a78e6628b9cb5002db6ea87a37e5c06aa6b9abf..515695bf5038b195b73000e38d48ccc89d3eaba4 100644 (file)
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -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/lisp/international/ogonek.el b/lisp/international/ogonek.el
index 06bebb1f0dabc3055b2cc1752c9f80aa2e18d7c6..4625dfa729b7dc3572225afdf1d4561c77f5f238 100644 (file)
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -11,7 +11,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/lisp/international/subst-big5.el b/lisp/international/subst-big5.el
index e53826f2ee50d6c4e2316078be4c8d0f0349b8e9..e744305f7991d23de254e7035807250263f82eb1 100644 (file)
--- a/lisp/international/subst-big5.el
+++ b/lisp/international/subst-big5.el
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,

diff --git a/lisp/international/subst-gb2312.el b/lisp/international/subst-gb2312.el
index 83ba31a260162bdbb1d6913c40103364764f84c4..3c604b6308ac96f0f6a4bab4f185fd889a3b54ba 100644 (file)
--- a/lisp/international/subst-gb2312.el
+++ b/lisp/international/subst-gb2312.el
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,

diff --git a/lisp/international/subst-ksc.el b/lisp/international/subst-ksc.el
index 7ac82de9daf1dbfbc9f38328d2f6fe4334a55861..69f5296e9173498dd9f3d0c55f34501a7f56fd0a 100644 (file)
--- a/lisp/international/subst-ksc.el
+++ b/lisp/international/subst-ksc.el
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,

diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index eb413b29f7bdcf60e2c98d57208990a26b7b66a2..0fff064ace872dc3b0193567db3cb6096c1001c9 100644 (file)
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -7,7 +7,7 @@
 
 ;; This file 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.
 
 ;; This file is distributed in the hope that it will be useful,

diff --git a/make-dist b/make-dist
index 155419ae567b5e0e3053c20c05b5ad067d64260b..93054f8fb896932c807358d9fbcfd00137384d4d 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -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/update-subdirs b/update-subdirs
index 2ce9a3de889307dceb54de750a363ddebe7455bb..c1d44cab9b931440ddf2780bb0c02703b20d1b10 100755 (executable)
--- a/update-subdirs
+++ b/update-subdirs
@@ -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,