summaryrefslogtreecommitdiff
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 4c5d9b68751..a98c5a626b4 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 0970572c3a0..3a26faaf7e3 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 6f6508feceb..b09db10cd3a 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 16301bc8b45..acb3db98d57 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 df58b811907..188636f71dc 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 ab32c3e798b..ebd1aa7e38a 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 993dec32f01..03c27378c29 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 caeae315f21..0e8cf6fee4f 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 38b399150b2..c7566f1471e 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 b554f019827..10d72404d45 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 30e2aecfb20..f26e8b92f0a 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 553e4607e6b..9158fff705a 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 065b3f381c9..646f3c16623 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 378646ae46b..6106ecf244d 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 d5ed027fff0..171c94b2910 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 bf9bdc21379..93b5f18473d 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 54160808cc0..5a5b8120db7 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 e548a67a699..d6a5048e283 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 5140348e7cc..a387b759ab1 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 76c2bc7937e..afb089ee221 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 5eeec0b8ab3..27fa4a6ce58 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 4e271c9bf4d..241e5826183 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 9aa7257b824..1e826a40ac0 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 ebaeff37162..64ce93fbb9d 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 2d25a935425..7f318837551 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 97bab8d93d3..cf76c43dcca 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 bf91d2ecff8..725f427182e 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 bae7815fa80..b2356ccf6c3 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 ede7d023e87..e2fc4ec8a65 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 2a6939da5f5..4c183fff01d 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 024333c4a88..c5de1218cfc 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 5007a00b16d..12acbfde168 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 ff30e4c14c4..2b05e640419 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 6d89b730668..270216c50fe 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 81665ffd1ce..83db29f86e5 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 b75a7cdaab3..a1bf24ab411 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 c4475d84c10..ee7965e735d 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 3b16c14dc4e..5c54184e684 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 2b5ba1de650..aac41f3dcac 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 d671d2900c2..423b3cde6b8 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 9def8bd0441..75e8ed789da 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 05f259b038f..2a74c44d47b 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 80bfd2dbfa3..d142d9e0845 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 78ef30a56de..61542d68628 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 bee0bdcbca3..9a28b98205e 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 43251b3721e..1804dc394eb 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 b5100c683ed..2219fde533d 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 ed5df5b9592..5d7fd655f84 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 222209582bd..d56d1ea5185 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 9c99077cbcc..037a8a254a4 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 2d8791b49e3..90c21688d84 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 49041e611ac..6e4347e6600 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 9d2297cb7a7..bcc81fa5ede 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 656f6b60096..946b1628a86 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 b25e90cebe9..7f940cd5b81 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 d12ed650186..83e9c773915 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 857df138670..f9d0860004a 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 1ae1f461f2d..c5e45fd0a99 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 75d9d1fb337..c331635a09a 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 c391319b885..c27046c1f31 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 715b06190b4..84772a5adfa 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 0fed075f553..579c08ccf8a 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 ba190ba171d..9a388d8445e 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 b9b0eeb2a14..ea0323505e4 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 3a9778bf22b..de869133ded 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 3cf291eb589..6e92af16c14 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 cbb2f09a35b..1fe758c5953 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 e4158f682ad..8d00f3033e0 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 1d90e2d9a0c..ed8da2bb15e 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 3ce0ef696d2..72bb7836d0b 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 3162b504a23..6cd9bd5c0d7 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 67d8734c482..d6d029705d0 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 d79a20a024e..d0bb61dc3b3 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 94dc50bc15d..9725d42da1e 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 2a1cc0fd679..dfd68653396 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 191637fb1a4..8f24316b3e2 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 750d724f9f2..097bd18bb1a 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,