Switch license to GPLv3 or later.

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 4c5d9b6..a98c5a6 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/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/leim/leim-ext.el b/leim/leim-ext.el
index 0970572..3a26faa 100644 (file)
--- a/leim/leim-ext.el
+++ b/leim/leim-ext.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/makefile.w32-in b/leim/makefile.w32-in
index 6f6508f..b09db10 100644 (file)
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-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/leim/quail/cyril-jis.el b/leim/quail/cyril-jis.el
index 16301bc..acb3db9 100644 (file)
--- a/leim/quail/cyril-jis.el
+++ b/leim/quail/cyril-jis.el
@@ -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/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index df58b81..188636f 100644 (file)
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -14,7 +14,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/czech.el b/leim/quail/czech.el
index ab32c3e..ebd1aa7 100644 (file)
--- a/leim/quail/czech.el
+++ b/leim/quail/czech.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/ethiopic.el b/leim/quail/ethiopic.el
index 993dec3..03c2737 100644 (file)
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.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/greek.el b/leim/quail/greek.el
index caeae31..0e8cf6f 100644 (file)
--- a/leim/quail/greek.el
+++ b/leim/quail/greek.el
@@ -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/leim/quail/hangul.el b/leim/quail/hangul.el
index 38b3991..c7566f1 100644 (file)
--- a/leim/quail/hangul.el
+++ b/leim/quail/hangul.el
@@ -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/leim/quail/hangul3.el b/leim/quail/hangul3.el
index b554f01..10d7240 100644 (file)
--- a/leim/quail/hangul3.el
+++ b/leim/quail/hangul3.el
@@ -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/leim/quail/hanja-jis.el b/leim/quail/hanja-jis.el
index 30e2aec..f26e8b9 100644 (file)
--- a/leim/quail/hanja-jis.el
+++ b/leim/quail/hanja-jis.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/hanja.el b/leim/quail/hanja.el
index 553e460..9158fff 100644 (file)
--- a/leim/quail/hanja.el
+++ b/leim/quail/hanja.el
@@ -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/leim/quail/hebrew.el b/leim/quail/hebrew.el
index 065b3f3..646f3c1 100644 (file)
--- a/leim/quail/hebrew.el
+++ b/leim/quail/hebrew.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/ipa.el b/leim/quail/ipa.el
index 378646a..6106ecf 100644 (file)
--- a/leim/quail/ipa.el
+++ b/leim/quail/ipa.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/japanese.el b/leim/quail/japanese.el
index d5ed027..171c94b 100644 (file)
--- a/leim/quail/japanese.el
+++ b/leim/quail/japanese.el
@@ -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/leim/quail/lao.el b/leim/quail/lao.el
index bf9bdc2..93b5f18 100644 (file)
--- a/leim/quail/lao.el
+++ b/leim/quail/lao.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/latin-alt.el b/leim/quail/latin-alt.el
index 5416080..5a5b812 100644 (file)
--- a/leim/quail/latin-alt.el
+++ b/leim/quail/latin-alt.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/latin-ltx.el b/leim/quail/latin-ltx.el
index e548a67..d6a5048 100644 (file)
--- a/leim/quail/latin-ltx.el
+++ b/leim/quail/latin-ltx.el
@@ -14,7 +14,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/latin-post.el b/leim/quail/latin-post.el
index 5140348..a387b75 100644 (file)
--- a/leim/quail/latin-post.el
+++ b/leim/quail/latin-post.el
@@ -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/leim/quail/latin-pre.el b/leim/quail/latin-pre.el
index 76c2bc7..afb089e 100644 (file)
--- a/leim/quail/latin-pre.el
+++ b/leim/quail/latin-pre.el
@@ -14,7 +14,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/lrt.el b/leim/quail/lrt.el
index 5eeec0b..27fa4a6 100644 (file)
--- a/leim/quail/lrt.el
+++ b/leim/quail/lrt.el
@@ -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/leim/quail/py-punct.el b/leim/quail/py-punct.el
index 4e271c9..241e582 100644 (file)
--- a/leim/quail/py-punct.el
+++ b/leim/quail/py-punct.el
@@ -15,7 +15,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/pypunct-b5.el b/leim/quail/pypunct-b5.el
index 9aa7257..1e826a4 100644 (file)
--- a/leim/quail/pypunct-b5.el
+++ b/leim/quail/pypunct-b5.el
@@ -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/leim/quail/symbol-ksc.el b/leim/quail/symbol-ksc.el
index ebaeff3..64ce93f 100644 (file)
--- a/leim/quail/symbol-ksc.el
+++ b/leim/quail/symbol-ksc.el
@@ -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/leim/quail/thai.el b/leim/quail/thai.el
index 2d25a93..7f31883 100644 (file)
--- a/leim/quail/thai.el
+++ b/leim/quail/thai.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/tibetan.el b/leim/quail/tibetan.el
index 97bab8d..cf76c43 100644 (file)
--- a/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@ -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/leim/quail/uni-input.el b/leim/quail/uni-input.el
index bf91d2e..725f427 100644 (file)
--- a/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@ -13,7 +13,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/viqr.el b/leim/quail/viqr.el
index bae7815..b2356cc 100644 (file)
--- a/leim/quail/viqr.el
+++ b/leim/quail/viqr.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/composite.el b/lisp/composite.el
index ede7d02..e2fc4ec 100644 (file)
--- a/lisp/composite.el
+++ b/lisp/composite.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/ccl.el b/lisp/international/ccl.el
index 2a6939d..4c183ff 100644 (file)
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -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/lisp/international/characters.el b/lisp/international/characters.el
index 024333c..c5de121 100644 (file)
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -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/lisp/international/code-pages.el b/lisp/international/code-pages.el
index 5007a00..12acbfd 100644 (file)
--- a/lisp/international/code-pages.el
+++ b/lisp/international/code-pages.el
@@ -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/lisp/international/codepage.el b/lisp/international/codepage.el
index ff30e4c..2b05e64 100644 (file)
--- a/lisp/international/codepage.el
+++ b/lisp/international/codepage.el
@@ -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/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index 6d89b73..270216c 100644 (file)
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.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/fontset.el b/lisp/international/fontset.el
index 81665ff..83db29f 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -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/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index b75a7cd..a1bf24a 100644 (file)
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -16,7 +16,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/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index c4475d8..ee7965e 100644 (file)
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.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/ja-dic-utl.el b/lisp/international/ja-dic-utl.el
index 3b16c14..5c54184 100644 (file)
--- a/lisp/international/ja-dic-utl.el
+++ b/lisp/international/ja-dic-utl.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/kinsoku.el b/lisp/international/kinsoku.el
index 2b5ba1d..aac41f3 100644 (file)
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -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/lisp/international/kkc.el b/lisp/international/kkc.el
index d671d29..423b3cd 100644 (file)
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -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/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 9def8bd..75e8ed7 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -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/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 05f259b..2a74c44 100644 (file)
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.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/mule-diag.el b/lisp/international/mule-diag.el
index 80bfd2d..d142d9e 100644 (file)
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -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/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 78ef30a..61542d6 100644 (file)
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -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/lisp/international/mule.el b/lisp/international/mule.el
index bee0bdc..9a28b98 100644 (file)
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -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/lisp/international/quail.el b/lisp/international/quail.el
index 43251b3..1804dc3 100644 (file)
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -16,7 +16,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-jis.el b/lisp/international/subst-jis.el
index b5100c6..2219fde 100644 (file)
--- a/lisp/international/subst-jis.el
+++ b/lisp/international/subst-jis.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/titdic-cnv.el b/lisp/international/titdic-cnv.el
index ed5df5b..5d7fd65 100644 (file)
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -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/lisp/international/ucs-tables.el b/lisp/international/ucs-tables.el
index 2222095..d56d1ea 100644 (file)
--- a/lisp/international/ucs-tables.el
+++ b/lisp/international/ucs-tables.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/utf-16.el b/lisp/international/utf-16.el
index 9c99077..037a8a2 100644 (file)
--- a/lisp/international/utf-16.el
+++ b/lisp/international/utf-16.el
@@ -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/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 2d8791b..90c2168 100644 (file)
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -14,7 +14,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/language/china-util.el b/lisp/language/china-util.el
index 49041e6..6e4347e 100644 (file)
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -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/lisp/language/chinese.el b/lisp/language/chinese.el
index 9d2297c..bcc81fa 100644 (file)
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -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/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 656f6b6..946b162 100644 (file)
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -14,7 +14,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/language/devan-util.el b/lisp/language/devan-util.el
index b25e90c..7f940cd 100644 (file)
--- a/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@ -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/lisp/language/english.el b/lisp/language/english.el
index d12ed65..83e9c77 100644 (file)
--- a/lisp/language/english.el
+++ b/lisp/language/english.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/language/ethio-util.el b/lisp/language/ethio-util.el
index 857df13..f9d0860 100644 (file)
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.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/language/ethiopic.el b/lisp/language/ethiopic.el
index 1ae1f46..c5e45fd 100644 (file)
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -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/lisp/language/european.el b/lisp/language/european.el
index 75d9d1f..c331635 100644 (file)
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -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/lisp/language/greek.el b/lisp/language/greek.el
index c391319..c27046c 100644 (file)
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.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/language/hebrew.el b/lisp/language/hebrew.el
index 715b061..84772a5 100644 (file)
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -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/lisp/language/indian.el b/lisp/language/indian.el
index 0fed075..579c08c 100644 (file)
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -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/lisp/language/japan-util.el b/lisp/language/japan-util.el
index ba190ba..9a388d8 100644 (file)
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -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/lisp/language/japanese.el b/lisp/language/japanese.el
index b9b0eeb..ea03235 100644 (file)
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -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/lisp/language/korea-util.el b/lisp/language/korea-util.el
index 3a9778b..de86913 100644 (file)
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.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/language/korean.el b/lisp/language/korean.el
index 3cf291e..6e92af1 100644 (file)
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -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/lisp/language/lao-util.el b/lisp/language/lao-util.el
index cbb2f09..1fe758c 100644 (file)
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.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/language/lao.el b/lisp/language/lao.el
index e4158f6..8d00f30 100644 (file)
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.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/language/misc-lang.el b/lisp/language/misc-lang.el
index 1d90e2d..ed8da2b 100644 (file)
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.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/language/thai-util.el b/lisp/language/thai-util.el
index 3ce0ef6..72bb783 100644 (file)
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -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/lisp/language/thai-word.el b/lisp/language/thai-word.el
index 3162b50..6cd9bd5 100644 (file)
--- a/lisp/language/thai-word.el
+++ b/lisp/language/thai-word.el
@@ -10,7 +10,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/lisp/language/thai.el b/lisp/language/thai.el
index 67d8734..d6d0297 100644 (file)
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -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/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index d79a20a..d0bb61d 100644 (file)
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -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/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 94dc50b..9725d42 100644 (file)
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.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/language/viet-util.el b/lisp/language/viet-util.el
index 2a1cc0f..dfd6865 100644 (file)
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -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/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index 191637f..8f24316 100644 (file)
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -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/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 750d724..097bd18 100644 (file)
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -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,