aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--leim/Makefile.in2
-rw-r--r--leim/leim-ext.el2
-rw-r--r--leim/makefile.w32-in2
-rw-r--r--leim/quail/cyril-jis.el2
-rw-r--r--leim/quail/cyrillic.el2
-rw-r--r--leim/quail/czech.el2
-rw-r--r--leim/quail/ethiopic.el2
-rw-r--r--leim/quail/greek.el2
-rw-r--r--leim/quail/hangul.el2
-rw-r--r--leim/quail/hangul3.el2
-rw-r--r--leim/quail/hanja-jis.el2
-rw-r--r--leim/quail/hanja.el2
-rw-r--r--leim/quail/hebrew.el2
-rw-r--r--leim/quail/ipa.el2
-rw-r--r--leim/quail/japanese.el2
-rw-r--r--leim/quail/lao.el2
-rw-r--r--leim/quail/latin-alt.el2
-rw-r--r--leim/quail/latin-ltx.el2
-rw-r--r--leim/quail/latin-post.el2
-rw-r--r--leim/quail/latin-pre.el2
-rw-r--r--leim/quail/lrt.el2
-rw-r--r--leim/quail/py-punct.el2
-rw-r--r--leim/quail/pypunct-b5.el2
-rw-r--r--leim/quail/symbol-ksc.el2
-rw-r--r--leim/quail/thai.el2
-rw-r--r--leim/quail/tibetan.el2
-rw-r--r--leim/quail/uni-input.el2
-rw-r--r--leim/quail/viqr.el2
-rw-r--r--lisp/composite.el2
-rw-r--r--lisp/international/ccl.el2
-rw-r--r--lisp/international/characters.el2
-rw-r--r--lisp/international/code-pages.el2
-rw-r--r--lisp/international/codepage.el2
-rw-r--r--lisp/international/encoded-kb.el2
-rw-r--r--lisp/international/fontset.el2
-rw-r--r--lisp/international/isearch-x.el2
-rw-r--r--lisp/international/ja-dic-cnv.el2
-rw-r--r--lisp/international/ja-dic-utl.el2
-rw-r--r--lisp/international/kinsoku.el2
-rw-r--r--lisp/international/kkc.el2
-rw-r--r--lisp/international/mule-cmds.el2
-rw-r--r--lisp/international/mule-conf.el2
-rw-r--r--lisp/international/mule-diag.el2
-rw-r--r--lisp/international/mule-util.el2
-rw-r--r--lisp/international/mule.el2
-rw-r--r--lisp/international/quail.el2
-rw-r--r--lisp/international/subst-jis.el2
-rw-r--r--lisp/international/titdic-cnv.el2
-rw-r--r--lisp/international/ucs-tables.el2
-rw-r--r--lisp/international/utf-16.el2
-rw-r--r--lisp/international/utf-8.el2
-rw-r--r--lisp/language/china-util.el2
-rw-r--r--lisp/language/chinese.el2
-rw-r--r--lisp/language/cyrillic.el2
-rw-r--r--lisp/language/devan-util.el2
-rw-r--r--lisp/language/english.el2
-rw-r--r--lisp/language/ethio-util.el2
-rw-r--r--lisp/language/ethiopic.el2
-rw-r--r--lisp/language/european.el2
-rw-r--r--lisp/language/greek.el2
-rw-r--r--lisp/language/hebrew.el2
-rw-r--r--lisp/language/indian.el2
-rw-r--r--lisp/language/japan-util.el2
-rw-r--r--lisp/language/japanese.el2
-rw-r--r--lisp/language/korea-util.el2
-rw-r--r--lisp/language/korean.el2
-rw-r--r--lisp/language/lao-util.el2
-rw-r--r--lisp/language/lao.el2
-rw-r--r--lisp/language/misc-lang.el2
-rw-r--r--lisp/language/thai-util.el2
-rw-r--r--lisp/language/thai-word.el2
-rw-r--r--lisp/language/thai.el2
-rw-r--r--lisp/language/tibet-util.el2
-rw-r--r--lisp/language/tibetan.el2
-rw-r--r--lisp/language/viet-util.el2
-rw-r--r--lisp/language/vietnamese.el2
-rw-r--r--lisp/ps-bdf.el2
77 files changed, 77 insertions, 77 deletions
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 4c5d9b6875..a98c5a626b 100644
--- 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 0970572c3a..3a26faaf7e 100644
--- 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 6f6508fece..b09db10cd3 100644
--- 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 16301bc8b4..acb3db98d5 100644
--- 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 df58b81190..188636f71d 100644
--- 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 ab32c3e798..ebd1aa7e38 100644
--- 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 993dec32f0..03c27378c2 100644
--- 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 caeae315f2..0e8cf6fee4 100644
--- 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 38b399150b..c7566f1471 100644
--- 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 b554f01982..10d72404d4 100644
--- 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 30e2aecfb2..f26e8b92f0 100644
--- 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 553e4607e6..9158fff705 100644
--- 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 065b3f381c..646f3c1662 100644
--- 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 378646ae46..6106ecf244 100644
--- 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 d5ed027fff..171c94b291 100644
--- 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 bf9bdc2137..93b5f18473 100644
--- 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 54160808cc..5a5b8120db 100644
--- 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 e548a67a69..d6a5048e28 100644
--- 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 5140348e7c..a387b759ab 100644
--- 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 76c2bc7937..afb089ee22 100644
--- 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 5eeec0b8ab..27fa4a6ce5 100644
--- 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 4e271c9bf4..241e582618 100644
--- 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 9aa7257b82..1e826a40ac 100644
--- 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 ebaeff3716..64ce93fbb9 100644
--- 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 2d25a93542..7f31883755 100644
--- 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 97bab8d93d..cf76c43dcc 100644
--- 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 bf91d2ecff..725f427182 100644
--- 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 bae7815fa8..b2356ccf6c 100644
--- 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 ede7d023e8..e2fc4ec8a6 100644
--- 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 2a6939da5f..4c183fff01 100644
--- 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 024333c4a8..c5de1218cf 100644
--- 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 5007a00b16..12acbfde16 100644
--- 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 ff30e4c14c..2b05e64041 100644
--- 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 6d89b73066..270216c50f 100644
--- 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 81665ffd1c..83db29f86e 100644
--- 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 b75a7cdaab..a1bf24ab41 100644
--- 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 c4475d84c1..ee7965e735 100644
--- 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 3b16c14dc4..5c54184e68 100644
--- 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 2b5ba1de65..aac41f3dca 100644
--- 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 d671d2900c..423b3cde6b 100644
--- 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 9def8bd044..75e8ed789d 100644
--- 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 05f259b038..2a74c44d47 100644
--- 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 80bfd2dbfa..d142d9e084 100644
--- 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 78ef30a56d..61542d6862 100644
--- 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 bee0bdcbca..9a28b98205 100644
--- 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 43251b3721..1804dc394e 100644
--- 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 b5100c683e..2219fde533 100644
--- 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 ed5df5b959..5d7fd655f8 100644
--- 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 222209582b..d56d1ea518 100644
--- 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 9c99077cbc..037a8a254a 100644
--- 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 2d8791b49e..90c21688d8 100644
--- 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 49041e611a..6e4347e660 100644
--- 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 9d2297cb7a..bcc81fa5ed 100644
--- 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 656f6b6009..946b1628a8 100644
--- 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 b25e90cebe..7f940cd5b8 100644
--- 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 d12ed65018..83e9c77391 100644
--- 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 857df13867..f9d0860004 100644
--- 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 1ae1f461f2..c5e45fd0a9 100644
--- 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 75d9d1fb33..c331635a09 100644
--- 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 c391319b88..c27046c1f3 100644
--- 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 715b06190b..84772a5adf 100644
--- 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 0fed075f55..579c08ccf8 100644
--- 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 ba190ba171..9a388d8445 100644
--- 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 b9b0eeb2a1..ea0323505e 100644
--- 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 3a9778bf22..de869133de 100644
--- 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 3cf291eb58..6e92af16c1 100644
--- 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 cbb2f09a35..1fe758c595 100644
--- 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 e4158f682a..8d00f3033e 100644
--- 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 1d90e2d9a0..ed8da2bb15 100644
--- 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 3ce0ef696d..72bb7836d0 100644
--- 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 3162b504a2..6cd9bd5c0d 100644
--- 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 67d8734c48..d6d029705d 100644
--- 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 d79a20a024..d0bb61dc3b 100644
--- 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 94dc50bc15..9725d42da1 100644
--- 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 2a1cc0fd67..dfd6865339 100644
--- 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 191637fb1a..8f24316b3e 100644
--- 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 750d724f9f..097bd18bb1 100644
--- 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,