summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-07-26 05:28:10 +0000
committerMiles Bader <miles@gnu.org>2007-07-26 05:28:10 +0000
commit9aecacd08a93bffb529cee59d74477890ce96f37 (patch)
tree149d4cef4deb6e93e300b6ef89322181a3d29ce4 /src
parent9ee365d565205366d61d9b50dd2a15ef903be983 (diff)
parentef2805c29bb03f0c8c0d4b37a65f511123dcab1c (diff)
downloademacs-9aecacd08a93bffb529cee59d74477890ce96f37.tar.gz
Merge from emacs--rel--22
Patches applied: * emacs--rel--22 (patch 70-73) - Update from CVS 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
Diffstat (limited to 'src')
-rw-r--r--src/.gdbinit2
-rw-r--r--src/ChangeLog17
-rw-r--r--src/ChangeLog.12
-rw-r--r--src/ChangeLog.22
-rw-r--r--src/ChangeLog.32
-rw-r--r--src/ChangeLog.42
-rw-r--r--src/ChangeLog.52
-rw-r--r--src/ChangeLog.68
-rw-r--r--src/ChangeLog.72
-rw-r--r--src/ChangeLog.82
-rw-r--r--src/ChangeLog.92
-rw-r--r--src/Makefile.in2
-rw-r--r--src/README2
-rw-r--r--src/abbrev.c2
-rw-r--r--src/alloc.c2
-rw-r--r--src/atimer.c2
-rw-r--r--src/atimer.h2
-rw-r--r--src/blockinput.h2
-rw-r--r--src/buffer.c2
-rw-r--r--src/buffer.h2
-rw-r--r--src/bytecode.c2
-rw-r--r--src/callint.c2
-rw-r--r--src/callproc.c2
-rw-r--r--src/casefiddle.c2
-rw-r--r--src/casetab.c2
-rw-r--r--src/category.c2
-rw-r--r--src/category.h2
-rw-r--r--src/ccl.c2
-rw-r--r--src/ccl.h2
-rw-r--r--src/charset.c2
-rw-r--r--src/charset.h2
-rw-r--r--src/cm.c2
-rw-r--r--src/cm.h2
-rw-r--r--src/cmds.c2
-rw-r--r--src/coding.c2
-rw-r--r--src/coding.h2
-rw-r--r--src/commands.h2
-rw-r--r--src/composite.c2
-rw-r--r--src/composite.h2
-rw-r--r--src/config.in2
-rw-r--r--src/cxux-crt0.s28
-rw-r--r--src/data.c2
-rw-r--r--src/dired.c2
-rw-r--r--src/dispextern.h2
-rw-r--r--src/dispnew.c2
-rw-r--r--src/disptab.h2
-rw-r--r--src/doc.c2
-rw-r--r--src/doprnt.c2
-rw-r--r--src/dosfns.c2
-rw-r--r--src/dosfns.h2
-rw-r--r--src/ecrt0.c2
-rw-r--r--src/editfns.c2
-rw-r--r--src/emacs.c2
-rw-r--r--src/epaths.in2
-rw-r--r--src/eval.c2
-rw-r--r--src/fileio.c2
-rw-r--r--src/filemode.c2
-rw-r--r--src/firstfile.c2
-rw-r--r--src/floatfns.c2
-rw-r--r--src/fns.c2
-rw-r--r--src/fontset.c2
-rw-r--r--src/fontset.h2
-rw-r--r--src/frame.c2
-rw-r--r--src/frame.h2
-rw-r--r--src/fringe.c2
-rw-r--r--src/getpagesize.h2
-rw-r--r--src/gnu.h2
-rw-r--r--src/gtkutil.c2
-rw-r--r--src/gtkutil.h2
-rw-r--r--src/image.c2
-rw-r--r--src/indent.c2
-rw-r--r--src/indent.h2
-rw-r--r--src/insdel.c2
-rw-r--r--src/intervals.c2
-rw-r--r--src/intervals.h2
-rw-r--r--src/keyboard.c2
-rw-r--r--src/keyboard.h2
-rw-r--r--src/keymap.c2
-rw-r--r--src/keymap.h2
-rw-r--r--src/lastfile.c2
-rw-r--r--src/lisp.h2
-rw-r--r--src/lread.c2
-rw-r--r--src/m/7300.h2
-rw-r--r--src/m/acorn.h2
-rw-r--r--src/m/alliant-2800.h2
-rw-r--r--src/m/alliant.h2
-rw-r--r--src/m/alpha.h2
-rw-r--r--src/m/altos.h2
-rw-r--r--src/m/amdahl.h2
-rw-r--r--src/m/amdx86-64.h2
-rw-r--r--src/m/apollo.h2
-rw-r--r--src/m/arm.h2
-rw-r--r--src/m/att3b.h2
-rw-r--r--src/m/aviion.h2
-rw-r--r--src/m/celerity.h2
-rw-r--r--src/m/clipper.h2
-rw-r--r--src/m/cnvrgnt.h2
-rw-r--r--src/m/convex.h2
-rw-r--r--src/m/cydra5.h2
-rw-r--r--src/m/delta88k.h2
-rw-r--r--src/m/dpx2.h2
-rw-r--r--src/m/dual.h2
-rw-r--r--src/m/elxsi.h2
-rw-r--r--src/m/ews4800.h2
-rw-r--r--src/m/gould-np1.h2
-rw-r--r--src/m/gould.h2
-rw-r--r--src/m/hp800.h2
-rw-r--r--src/m/hp9000s300.h2
-rw-r--r--src/m/i860.h2
-rw-r--r--src/m/ia64.h2
-rw-r--r--src/m/ibm370aix.h2
-rw-r--r--src/m/ibmps2-aix.h2
-rw-r--r--src/m/ibmrs6000.h2
-rw-r--r--src/m/ibmrt-aix.h2
-rw-r--r--src/m/ibmrt.h2
-rw-r--r--src/m/ibms390.h2
-rw-r--r--src/m/ibms390x.h2
-rw-r--r--src/m/intel386.h2
-rw-r--r--src/m/iris4d.h2
-rw-r--r--src/m/irist.h2
-rw-r--r--src/m/isi-ov.h2
-rw-r--r--src/m/m68k.h2
-rw-r--r--src/m/macppc.h2
-rw-r--r--src/m/masscomp.h2
-rw-r--r--src/m/mega68.h2
-rw-r--r--src/m/mg1.h2
-rw-r--r--src/m/mips-siemens.h2
-rw-r--r--src/m/mips.h2
-rw-r--r--src/m/mips4.h2
-rw-r--r--src/m/news-risc.h2
-rw-r--r--src/m/news.h2
-rw-r--r--src/m/next.h2
-rw-r--r--src/m/nh3000.h2
-rw-r--r--src/m/nh4000.h2
-rw-r--r--src/m/ns16000.h2
-rw-r--r--src/m/ns32000.h2
-rw-r--r--src/m/nu.h2
-rw-r--r--src/m/orion.h2
-rw-r--r--src/m/orion105.h2
-rw-r--r--src/m/pfa50.h2
-rw-r--r--src/m/plexus.h2
-rw-r--r--src/m/pmax.h2
-rw-r--r--src/m/powermac.h2
-rw-r--r--src/m/powerpcle.h2
-rw-r--r--src/m/pyramid.h2
-rw-r--r--src/m/sequent-ptx.h2
-rw-r--r--src/m/sequent.h2
-rw-r--r--src/m/sh3el.h2
-rw-r--r--src/m/sparc.h2
-rw-r--r--src/m/sps7.h2
-rw-r--r--src/m/sr2k.h2
-rw-r--r--src/m/stride.h2
-rw-r--r--src/m/sun1.h2
-rw-r--r--src/m/sun2.h2
-rw-r--r--src/m/sun386.h2
-rw-r--r--src/m/symmetry.h2
-rw-r--r--src/m/tad68k.h2
-rw-r--r--src/m/tahoe.h2
-rw-r--r--src/m/targon31.h2
-rw-r--r--src/m/tek4300.h2
-rw-r--r--src/m/tekxd88.h2
-rw-r--r--src/m/template.h2
-rw-r--r--src/m/tower32.h2
-rw-r--r--src/m/tower32v3.h2
-rw-r--r--src/m/ustation.h2
-rw-r--r--src/m/vax.h2
-rw-r--r--src/m/wicat.h2
-rw-r--r--src/m/windowsnt.h2
-rw-r--r--src/m/xps100.h2
-rw-r--r--src/mac.c2
-rw-r--r--src/macfns.c2
-rw-r--r--src/macgui.h2
-rw-r--r--src/macmenu.c2
-rw-r--r--src/macros.c2
-rw-r--r--src/macros.h2
-rw-r--r--src/macselect.c2
-rw-r--r--src/macterm.c2
-rw-r--r--src/macterm.h2
-rw-r--r--src/makefile.w32-in2
-rw-r--r--src/marker.c2
-rw-r--r--src/mem-limits.h2
-rw-r--r--src/minibuf.c2
-rw-r--r--src/msdos.c2
-rw-r--r--src/msdos.h2
-rw-r--r--src/prefix-args.c2
-rw-r--r--src/print.c2
-rw-r--r--src/process.c2
-rw-r--r--src/process.h2
-rw-r--r--src/puresize.h2
-rw-r--r--src/ralloc.c2
-rw-r--r--src/region-cache.c2
-rw-r--r--src/region-cache.h2
-rw-r--r--src/s/aix3-1.h2
-rw-r--r--src/s/aix3-2.h2
-rw-r--r--src/s/aix4-1.h2
-rw-r--r--src/s/bsd386.h2
-rw-r--r--src/s/bsd4-1.h2
-rw-r--r--src/s/bsd4-2.h2
-rw-r--r--src/s/bsd4-3.h2
-rw-r--r--src/s/cxux.h2
-rw-r--r--src/s/cygwin.h2
-rw-r--r--src/s/darwin.h2
-rw-r--r--src/s/dgux.h2
-rw-r--r--src/s/dgux4.h2
-rw-r--r--src/s/dgux5-4-3.h2
-rw-r--r--src/s/dgux5-4r2.h2
-rw-r--r--src/s/freebsd.h2
-rw-r--r--src/s/gnu-linux.h2
-rw-r--r--src/s/gnu.h2
-rw-r--r--src/s/hiuxmpp.h2
-rw-r--r--src/s/hiuxwe2.h2
-rw-r--r--src/s/hpux.h2
-rw-r--r--src/s/hpux10.h2
-rw-r--r--src/s/hpux8.h2
-rw-r--r--src/s/hpux9.h2
-rw-r--r--src/s/iris3-5.h2
-rw-r--r--src/s/iris3-6.h2
-rw-r--r--src/s/irix3-3.h2
-rw-r--r--src/s/irix4-0.h2
-rw-r--r--src/s/irix5-0.h2
-rw-r--r--src/s/irix6-0.h2
-rw-r--r--src/s/irix6-5.h2
-rw-r--r--src/s/isc2-2.h2
-rw-r--r--src/s/isc3-0.h2
-rw-r--r--src/s/lynxos.h2
-rw-r--r--src/s/ms-w32.h2
-rw-r--r--src/s/msdos.h2
-rw-r--r--src/s/netbsd.h2
-rw-r--r--src/s/newsos5.h2
-rw-r--r--src/s/nextstep.h2
-rw-r--r--src/s/osf1.h2
-rw-r--r--src/s/ptx.h2
-rw-r--r--src/s/ptx4.h2
-rw-r--r--src/s/riscix1-1.h22
-rw-r--r--src/s/riscix12.h2
-rw-r--r--src/s/rtu.h2
-rw-r--r--src/s/sco4.h2
-rw-r--r--src/s/sco5.h2
-rw-r--r--src/s/sol2-3.h2
-rw-r--r--src/s/sol2.h2
-rw-r--r--src/s/sunos4-0.h2
-rw-r--r--src/s/sunos4shr.h2
-rw-r--r--src/s/template.h2
-rw-r--r--src/s/umax.h2
-rw-r--r--src/s/unipl5-2.h2
-rw-r--r--src/s/usg5-0.h2
-rw-r--r--src/s/usg5-2-2.h2
-rw-r--r--src/s/usg5-2.h2
-rw-r--r--src/s/usg5-3.h2
-rw-r--r--src/s/usg5-4-2.h2
-rw-r--r--src/s/usg5-4.h2
-rw-r--r--src/s/vms.h2
-rw-r--r--src/s/xenix.h2
-rw-r--r--src/scroll.c2
-rw-r--r--src/search.c2
-rw-r--r--src/sheap.c2
-rw-r--r--src/sound.c2
-rw-r--r--src/sunfns.c2
-rw-r--r--src/syntax.c2
-rw-r--r--src/syntax.h2
-rw-r--r--src/sysdep.c2
-rw-r--r--src/sysselect.h2
-rw-r--r--src/syssignal.h2
-rw-r--r--src/systime.h2
-rw-r--r--src/systty.h2
-rw-r--r--src/syswait.h2
-rw-r--r--src/term.c2
-rw-r--r--src/termchar.h2
-rw-r--r--src/termhooks.h2
-rw-r--r--src/terminfo.c2
-rw-r--r--src/termopts.h2
-rw-r--r--src/textprop.c2
-rw-r--r--src/uaf.h2
-rw-r--r--src/undo.c2
-rw-r--r--src/unexaix.c2
-rw-r--r--src/unexalpha.c2
-rw-r--r--src/unexapollo.c2
-rw-r--r--src/unexconvex.c2
-rw-r--r--src/unexcw.c2
-rw-r--r--src/unexec.c2
-rw-r--r--src/unexelf.c2
-rw-r--r--src/unexenix.c2
-rw-r--r--src/unexmacosx.c2
-rw-r--r--src/unexmips.c2
-rw-r--r--src/unexnext.c2
-rw-r--r--src/unexsni.c2
-rw-r--r--src/unexsunos4.c2
-rw-r--r--src/unexw32.c2
-rw-r--r--src/vm-limit.c2
-rw-r--r--src/w16select.c2
-rw-r--r--src/w32.c2
-rw-r--r--src/w32.h2
-rw-r--r--src/w32bdf.c2
-rw-r--r--src/w32bdf.h2
-rw-r--r--src/w32console.c2
-rw-r--r--src/w32gui.h2
-rw-r--r--src/w32heap.c2
-rw-r--r--src/w32heap.h2
-rw-r--r--src/w32inevt.c2
-rw-r--r--src/w32inevt.h2
-rw-r--r--src/w32menu.c2
-rw-r--r--src/w32proc.c2
-rw-r--r--src/w32reg.c2
-rw-r--r--src/w32select.c2
-rw-r--r--src/w32term.c2
-rw-r--r--src/w32term.h2
-rw-r--r--src/w32xfns.c2
-rw-r--r--src/widget.c2
-rw-r--r--src/widget.h2
-rw-r--r--src/widgetprv.h2
-rw-r--r--src/window.c2
-rw-r--r--src/window.h2
-rw-r--r--src/xdisp.c2
-rw-r--r--src/xfaces.c2
-rw-r--r--src/xfns.c2
-rw-r--r--src/xmenu.c2
-rw-r--r--src/xrdb.c2
-rw-r--r--src/xselect.c2
-rw-r--r--src/xsmfns.c2
-rw-r--r--src/xterm.c2
-rw-r--r--src/xterm.h2
321 files changed, 352 insertions, 357 deletions
diff --git a/src/.gdbinit b/src/.gdbinit
index 5a940e667dc..851322059a8 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -5,7 +5,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/src/ChangeLog b/src/ChangeLog
index 49613185ae4..3779a9fe8f3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-25 Glenn Morris <rgm@gnu.org>
+
+ * Relicense all FSF files to GPLv3 or later.
+
+ * COPYING: Switch to GPLv3.
+
2007-07-25 Stefan Monnier <monnier@iro.umontreal.ca>
* eval.c (Fcommandp): Pay attention to the `interactive-form' property.
@@ -8,6 +14,15 @@
* data.c (Finteractive_form): Use an `interactive-form' property if
present, analogous to the function-documentation property.
+2007-07-24 Jason Rumney <jasonr@gnu.org>
+
+ * w32fns.c (x_real_positions): Get real position from OS instead of
+ calculating it.
+
+2007-07-23 Jason Rumney <jasonr@gnu.org>
+
+ * filelock.c (current_lock_owner): Allow for @ sign in username.
+
2007-07-22 Nick Roberts <nickrob@snap.net.nz>
* xdisp.c (decode_mode_spec): Add case 'R' for to test for
@@ -28726,7 +28741,7 @@ See ChangeLog.9 for earlier changes.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free 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/src/ChangeLog.1 b/src/ChangeLog.1
index d51791d9360..c7feabcb084 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3528,7 +3528,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/src/ChangeLog.2 b/src/ChangeLog.2
index 420688ac385..1e903fbfa72 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4778,7 +4778,7 @@ See ChangeLog.1 for earlier changes.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free 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/src/ChangeLog.3 b/src/ChangeLog.3
index d6e1dff4e32..662da73acd6 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16531,7 +16531,7 @@ See ChangeLog.2 for earlier changes.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free 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/src/ChangeLog.4 b/src/ChangeLog.4
index e611bd564c5..250ff282688 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6910,7 +6910,7 @@ See ChangeLog.3 for earlier changes.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free 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/src/ChangeLog.5 b/src/ChangeLog.5
index 975bd646285..b555020d625 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7151,7 +7151,7 @@ See ChangeLog.4 for earlier changes.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free 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/src/ChangeLog.6 b/src/ChangeLog.6
index 4572c8c0a3a..8bf2c9a278e 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -1643,9 +1643,9 @@
* emacs.c (main) [DJGPP v2]: Make standard streams use binary mode.
Call `tzset' instead of `init_gettimeofday'.
- * fileio.c [MSDOS]: If DJGPP version 2, include fcntl.h and string.h.
+ * fileio.c [MSDOS]: If DJGPP version 3, include fcntl.h and string.h.
- * lread.c [MSDOS]: If DJGPP version 2, include unistd.h.
+ * lread.c [MSDOS]: If DJGPP version 3, include unistd.h.
Include msdos.h somewhat earlier. For X_OK.
* unexec.c [DJGPP v2]: Include fcntl.h.
@@ -1664,7 +1664,7 @@
(LIBS_SYSTEM, chdir, NO_MODE_T, TEXT_START, NO_MATHERR)
(LOCALTIME_CACHE, tzset): Don't define if DJGPP v2.
- * msdos.c [MSDOS]: If DJGPP version 2, include fcntl.h.
+ * msdos.c [MSDOS]: If DJGPP version 3, include fcntl.h.
(_crt0_startup_flags): Initialize to work
correctly both with and without GNU `malloc' and `ralloc'.
(internal_terminal_init): Use only 3 bits when setting background
@@ -5361,7 +5361,7 @@ See ChangeLog.5 for earlier changes.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free 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/src/ChangeLog.7 b/src/ChangeLog.7
index 8abb6e89580..514204939ee 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11102,7 +11102,7 @@ See ChangeLog.6 for earlier changes.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free 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/src/ChangeLog.8 b/src/ChangeLog.8
index 09a2325536f..b156e4e39f8 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13998,7 +13998,7 @@ See ChangeLog.7 for earlier changes.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free 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/src/ChangeLog.9 b/src/ChangeLog.9
index b6bc7e3e78a..abfa5470f6e 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -13301,7 +13301,7 @@ See ChangeLog.8 for earlier changes.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free 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/src/Makefile.in b/src/Makefile.in
index 598fb582c39..2740cb96827 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -6,7 +6,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/src/README b/src/README
index 2751968ca89..f575af46e05 100644
--- a/src/README
+++ b/src/README
@@ -37,7 +37,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/abbrev.c b/src/abbrev.c
index 6447c450056..da1724e2998 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/alloc.c b/src/alloc.c
index 3497234234d..a69f5045713 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/atimer.c b/src/atimer.c
index 41dd9e53a02..d17bbc92d72 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/atimer.h b/src/atimer.h
index 8c3b388d012..1480e5152fd 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/blockinput.h b/src/blockinput.h
index 468f0e0c762..8fb827101a6 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/buffer.c b/src/buffer.c
index 1f66deb2455..2ded9857455 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/buffer.h b/src/buffer.h
index 0652fdb35a8..65cfef4f04f 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/bytecode.c b/src/bytecode.c
index 4cb9e7428fd..3582e69dfb7 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/callint.c b/src/callint.c
index 887f87630e3..9b3535474c0 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/callproc.c b/src/callproc.c
index 90e5b11a9a2..1ea0dfa43a6 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 57fcefdde3a..0e9e1ba2c34 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/casetab.c b/src/casetab.c
index cc0e814c171..bf0e022f139 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/category.c b/src/category.c
index 809e326cbe9..55e752045e7 100644
--- a/src/category.c
+++ b/src/category.c
@@ -10,7 +10,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/category.h b/src/category.h
index 858a94a6224..be534fb47f5 100644
--- a/src/category.h
+++ b/src/category.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/ccl.c b/src/ccl.c
index ee0250f6c2c..c25e67abf57 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -10,7 +10,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/ccl.h b/src/ccl.h
index af3a92d3285..7199170a15c 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/charset.c b/src/charset.c
index 0d91606da58..a6ec309cbb3 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -10,7 +10,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/charset.h b/src/charset.h
index 2d0116d263e..984d466d97d 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -10,7 +10,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/cm.c b/src/cm.c
index da984f0b82d..18331216776 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/cm.h b/src/cm.h
index d77ba582f74..7c26a9ce66a 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/cmds.c b/src/cmds.c
index 7e07ce1dc6f..b89074fbc5e 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/coding.c b/src/coding.c
index ad9536ec8c6..7359f0214ba 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -10,7 +10,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/coding.h b/src/coding.h
index b4e26686229..9906e66af6c 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -10,7 +10,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/commands.h b/src/commands.h
index 2d0db0ec13c..e59b3c0382a 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/composite.c b/src/composite.c
index b0a5ebbc3ee..95c19d74560 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -9,7 +9,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/composite.h b/src/composite.h
index 8ff6416990f..5dc8dde62e2 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -9,7 +9,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/config.in b/src/config.in
index 69d2504c871..70a5b7bee32 100644
--- a/src/config.in
+++ b/src/config.in
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/cxux-crt0.s b/src/cxux-crt0.s
index 9a359a44955..d9c570a9c18 100644
--- a/src/cxux-crt0.s
+++ b/src/cxux-crt0.s
@@ -4,21 +4,21 @@
* 2006, 2007 Free Software Foundation, Inc.
*
* This file is part of GNU Emacs.
- *
+ *
+ * GNU Emacs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
* GNU Emacs is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY. No author or distributor
- * accepts responsibility to anyone for the consequences of using it
- * or for whether it serves any particular purpose or works at all,
- * unless he says so in writing. Refer to the GNU Emacs General Public
- * License for full details.
- *
- * Everyone is granted permission to copy, modify and redistribute
- * GNU Emacs, but only under the conditions described in the
- * GNU Emacs General Public License. A copy of this license is
- * supposed to have been given to you along with GNU Emacs so you
- * can know your rights and responsibilities. It should be in a
- * file named COPYING. Among other things, the copyright notice
- * and this notice must be preserved on all copies.
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Emacs; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/*
diff --git a/src/data.c b/src/data.c
index 15169d3d3f4..3f27e387350 100644
--- a/src/data.c
+++ b/src/data.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/dired.c b/src/dired.c
index ee76fe47be2..22283b66ea0 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/dispextern.h b/src/dispextern.h
index 038f6d940b0..4cd9c42cc0f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/dispnew.c b/src/dispnew.c
index bd63c473cf8..1502ffd753c 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/disptab.h b/src/disptab.h
index e20f3e27631..19033dc993e 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/doc.c b/src/doc.c
index c0d4961606b..25f6625d404 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/doprnt.c b/src/doprnt.c
index 799f38d8f5d..e9c97d60ccc 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/dosfns.c b/src/dosfns.c
index e57a6a197be..32d7a2c8d74 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/dosfns.h b/src/dosfns.h
index 622e7cb5335..904de03fbe6 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -9,7 +9,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/ecrt0.c b/src/ecrt0.c
index 7f94f07dc00..114fc4ea699 100644
--- a/src/ecrt0.c
+++ b/src/ecrt0.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/editfns.c b/src/editfns.c
index f88d0a6b54c..7bb74958c2c 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/emacs.c b/src/emacs.c
index 51a7770bacd..6c7773770d7 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/epaths.in b/src/epaths.in
index 34d97897c7d..dc537fa035c 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/eval.c b/src/eval.c
index dd51270285b..78316eb1a3c 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/fileio.c b/src/fileio.c
index 53cab8c5955..f70109dc2ad 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/filemode.c b/src/filemode.c
index b15f65c1647..db0f98fdf75 100644
--- a/src/filemode.c
+++ b/src/filemode.c
@@ -4,7 +4,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/src/firstfile.c b/src/firstfile.c
index 8093f03efc3..35367246542 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/floatfns.c b/src/floatfns.c
index e0ed9b625cd..6ad9b95686e 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/fns.c b/src/fns.c
index fb9c446e35e..eef67551b48 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/fontset.c b/src/fontset.c
index 349603f7bb9..97f86faaff9 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -10,7 +10,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/fontset.h b/src/fontset.h
index a2bac100396..5b5c5cbcfaa 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -10,7 +10,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/frame.c b/src/frame.c
index 0e24ad59627..b29e20ab0ca 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/frame.h b/src/frame.h
index 7c46221da72..d5e9f21ed10 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/fringe.c b/src/fringe.c
index a3a28ba987e..3241786a115 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/getpagesize.h b/src/getpagesize.h
index c4551677d16..2eb6532737e 100644
--- a/src/getpagesize.h
+++ b/src/getpagesize.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/gnu.h b/src/gnu.h
index 953546e611a..b8045f28183 100644
--- a/src/gnu.h
+++ b/src/gnu.h
@@ -9,7 +9,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 02e42f74852..d463e0e6d79 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/gtkutil.h b/src/gtkutil.h
index f87583ea1c2..bacee26d418 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/image.c b/src/image.c
index a1a908600ee..74bb1d75451 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/indent.c b/src/indent.c
index b43120ab560..905cf7559a7 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/indent.h b/src/indent.h
index b9c39869e60..2d3c158b069 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/insdel.c b/src/insdel.c
index 65d60b6b8e3..14e7478e69a 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/intervals.c b/src/intervals.c
index 5d9550da791..89f99a052b9 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/intervals.h b/src/intervals.h
index 7e07a6b4f31..3b746ec40e9 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/keyboard.c b/src/keyboard.c
index 2c838d9a311..b096424a615 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/keyboard.h b/src/keyboard.h
index 6fe76363064..e24f9a133ae 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/keymap.c b/src/keymap.c
index 566ab41872f..c9817199a4f 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/keymap.h b/src/keymap.h
index df135114c87..1a51de705be 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/lastfile.c b/src/lastfile.c
index 7a7888f4683..ef7d2527b22 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/lisp.h b/src/lisp.h
index 7cdd5536bb8..d86fdc0e915 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/lread.c b/src/lread.c
index 943a55f31f8..ef999fac74c 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/7300.h b/src/m/7300.h
index 1022e077046..b590593abc8 100644
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/acorn.h b/src/m/acorn.h
index dee60071e12..7fa5991e28b 100644
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
index e81fe48b9e7..3d65f9d1f12 100644
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/alliant.h b/src/m/alliant.h
index 5ddab96012f..b871d4a2385 100644
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -9,7 +9,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 3b29a8ee7be..84e74d581d1 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/altos.h b/src/m/altos.h
index 1a7c6d4f95a..8a1cb138345 100644
--- a/src/m/altos.h
+++ b/src/m/altos.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index c5cae1fc560..3d9ee17e91f 100644
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 0dcf5524645..fbd53a955a2 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/apollo.h b/src/m/apollo.h
index 0e6e53327bc..b769c24c294 100644
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/arm.h b/src/m/arm.h
index 18675f2805c..b1df83f9b70 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 33411ff005c..3344aabc2a9 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/aviion.h b/src/m/aviion.h
index 87b7d963f5a..7f3f7f253d5 100644
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/celerity.h b/src/m/celerity.h
index 0eba349b7db..76f1e1729b3 100644
--- a/src/m/celerity.h
+++ b/src/m/celerity.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/clipper.h b/src/m/clipper.h
index 6851761d53e..de99ba97eb5 100644
--- a/src/m/clipper.h
+++ b/src/m/clipper.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index 09e3365bee9..f64fc86b08b 100644
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/convex.h b/src/m/convex.h
index 2904b5942f4..7f90d22117c 100644
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index 75aca4b0e64..2361fb4b589 100644
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 7017e38284e..c767e1db1ca 100644
--- a/src/m/delta88k.h
+++ b/src/m/delta88k.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index de0b93b21ac..1c1d146a08a 100644
--- a/src/m/dpx2.h
+++ b/src/m/dpx2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/dual.h b/src/m/dual.h
index 63829b75d2e..4fda7a8a96c 100644
--- a/src/m/dual.h
+++ b/src/m/dual.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index c264d57338b..81689e66e52 100644
--- a/src/m/elxsi.h
+++ b/src/m/elxsi.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ews4800.h b/src/m/ews4800.h
index 528ce95d685..35bfb59f152 100644
--- a/src/m/ews4800.h
+++ b/src/m/ews4800.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h
index a750c9f8f39..cb3da1825cc 100644
--- a/src/m/gould-np1.h
+++ b/src/m/gould-np1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/gould.h b/src/m/gould.h
index 0b422f18fe2..c31f50249e7 100644
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -12,7 +12,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/hp800.h b/src/m/hp800.h
index f48f4c8152e..d54690104b5 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index c02a68d31cc..3718bb3f3ae 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/i860.h b/src/m/i860.h
index 6af68cc2ae7..1255f2f1576 100644
--- a/src/m/i860.h
+++ b/src/m/i860.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 7e88aeaedc8..b6fea6b8fd7 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h
index 09460092b3e..f632a30780b 100644
--- a/src/m/ibm370aix.h
+++ b/src/m/ibm370aix.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index c8449baef41..8882052b006 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 6729282953e..2a298e7f760 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index ccee40a46a9..d24e99fe6d6 100644
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index 2cf372a278d..55cbfd88371 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index e038e2e1b52..aece0f7599e 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index f8b21bc3df4..fb1f210c634 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 44ba3245b2e..7c6c2106d17 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 4304871ca23..d918c25aede 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/irist.h b/src/m/irist.h
index 4ae3681bd92..0b33bd964aa 100644
--- a/src/m/irist.h
+++ b/src/m/irist.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
index ed96605b5a1..7e25ed9d277 100644
--- a/src/m/isi-ov.h
+++ b/src/m/isi-ov.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 1071847eda9..c771e863711 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 26994575edd..cc4afe31519 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index 777ff797727..ac753de1537 100644
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/mega68.h b/src/m/mega68.h
index 54340bdb0be..6d991ba06a2 100644
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/mg1.h b/src/m/mg1.h
index b0d6faca500..647544e21e4 100644
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
index 376f8805788..d90a651d361 100644
--- a/src/m/mips-siemens.h
+++ b/src/m/mips-siemens.h
@@ -11,7 +11,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/mips.h b/src/m/mips.h
index ee8e63030c7..b18324fb8b7 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/mips4.h b/src/m/mips4.h
index f9517d6b560..a55e4c5e313 100644
--- a/src/m/mips4.h
+++ b/src/m/mips4.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/news-risc.h b/src/m/news-risc.h
index 0a2564553f7..b7ea3dbceff 100644
--- a/src/m/news-risc.h
+++ b/src/m/news-risc.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/news.h b/src/m/news.h
index 13a718a8612..419015dd150 100644
--- a/src/m/news.h
+++ b/src/m/news.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/next.h b/src/m/next.h
index 2a0f7243772..ef92607d957 100644
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/nh3000.h b/src/m/nh3000.h
index e5cf1a61b58..e4a9817d57c 100644
--- a/src/m/nh3000.h
+++ b/src/m/nh3000.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/nh4000.h b/src/m/nh4000.h
index ba695700d77..20fadb71e43 100644
--- a/src/m/nh4000.h
+++ b/src/m/nh4000.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index 707cb21abb7..c64bfa32482 100644
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index fe1fd153b70..0b776115ca8 100644
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/nu.h b/src/m/nu.h
index 01fadeba18a..347606a6c01 100644
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/orion.h b/src/m/orion.h
index 472b7b4c8eb..36a74b3cc3b 100644
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/orion105.h b/src/m/orion105.h
index 586ddf2ea35..73408ed1b2f 100644
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index 3c13aa77872..8f1f146000e 100644
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/plexus.h b/src/m/plexus.h
index 606caeb20f4..4a4e6a32f7f 100644
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/pmax.h b/src/m/pmax.h
index 1f2869a09d3..fbeba17c9e3 100644
--- a/src/m/pmax.h
+++ b/src/m/pmax.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/powermac.h b/src/m/powermac.h
index 419edb21b9f..729bbb0358b 100644
--- a/src/m/powermac.h
+++ b/src/m/powermac.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h
index fb70cbfcb4f..403d6986bf8 100644
--- a/src/m/powerpcle.h
+++ b/src/m/powerpcle.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index 9a07ff09f1d..9ee3fefe387 100644
--- a/src/m/pyramid.h
+++ b/src/m/pyramid.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h
index 03a0bff3e12..8f915638a1a 100644
--- a/src/m/sequent-ptx.h
+++ b/src/m/sequent-ptx.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sequent.h b/src/m/sequent.h
index d0051642826..be5d3f19bd1 100644
--- a/src/m/sequent.h
+++ b/src/m/sequent.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sh3el.h b/src/m/sh3el.h
index 9c510979bdc..5851ade1523 100644
--- a/src/m/sh3el.h
+++ b/src/m/sh3el.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 3efb4c05553..f59c2c2b969 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sps7.h b/src/m/sps7.h
index db6c9d3a91e..68acf2c6c52 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
index 2342bf8ef20..ba4a9a905ab 100644
--- a/src/m/sr2k.h
+++ b/src/m/sr2k.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/stride.h b/src/m/stride.h
index 8acc84e3cbe..cb0380024a1 100644
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sun1.h b/src/m/sun1.h
index 526056dd80f..fda451a9310 100644
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sun2.h b/src/m/sun2.h
index cee54da79b7..00b7ae97c4d 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sun386.h b/src/m/sun386.h
index 21a07a69423..a3eedbe755e 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -9,7 +9,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index 39dde99f13c..ea3d9493504 100644
--- a/src/m/symmetry.h
+++ b/src/m/symmetry.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index 357bbe80982..5e982a314ab 100644
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index c28018a149d..8fe41cd4109 100644
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/targon31.h b/src/m/targon31.h
index 34e3ae40c9e..0c657e0ea5d 100644
--- a/src/m/targon31.h
+++ b/src/m/targon31.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index 30e40a0e09f..be43210212a 100644
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index 3b858310af3..1d46bb9bb55 100644
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/template.h b/src/m/template.h
index 79d2d40ab70..fccc5b0901c 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/tower32.h b/src/m/tower32.h
index cdb6884d5fc..0ce623b7f37 100644
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index 19e7d3ba7ea..226c0e2640a 100644
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ustation.h b/src/m/ustation.h
index b662cca208e..f88cdc5ee63 100644
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/vax.h b/src/m/vax.h
index fae30d37f73..80844ba3ba6 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/wicat.h b/src/m/wicat.h
index 6ab0a498104..67409844666 100644
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h
index 223958375ca..f1efe64a4f5 100644
--- a/src/m/windowsnt.h
+++ b/src/m/windowsnt.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/xps100.h b/src/m/xps100.h
index 89300211eec..691f5fedbd6 100644
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/mac.c b/src/mac.c
index d783243399d..a64c3d208e3 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/macfns.c b/src/macfns.c
index cd571a13c5e..34f80943497 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/macgui.h b/src/macgui.h
index 29905370763..7a65e583b1b 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/macmenu.c b/src/macmenu.c
index 6fe064dd55a..e2d4ba8be38 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/macros.c b/src/macros.c
index 40fb429d41d..7f9f37eff59 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/macros.h b/src/macros.h
index 2fb01667918..88f34879830 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/macselect.c b/src/macselect.c
index a34f58df0f0..04034c499b7 100644
--- a/src/macselect.c
+++ b/src/macselect.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/macterm.c b/src/macterm.c
index 906f946388c..1fd4ee308b1 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/macterm.h b/src/macterm.h
index f6ab9f70449..2dc13665f67 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index c28e27bdfcb..6611efbe3b2 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -6,7 +6,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/src/marker.c b/src/marker.c
index 31849782f6c..a57dafa3f3b 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/mem-limits.h b/src/mem-limits.h
index 30d57d8b51c..f1bad9bf6b9 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/minibuf.c b/src/minibuf.c
index c2654d02b04..9c21be3f068 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/msdos.c b/src/msdos.c
index 6420d16686f..59854268e14 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/msdos.h b/src/msdos.h
index 7a6d2e64ca0..c45a5853a6c 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/prefix-args.c b/src/prefix-args.c
index 50ab81c10c9..adf2743ba21 100644
--- a/src/prefix-args.c
+++ b/src/prefix-args.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/print.c b/src/print.c
index 76716fe7c24..f7060024f32 100644
--- a/src/print.c
+++ b/src/print.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/process.c b/src/process.c
index e588b3bc3ab..08358539a6c 100644
--- a/src/process.c
+++ b/src/process.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/process.h b/src/process.h
index fd7847b5e29..79875564766 100644
--- a/src/process.h
+++ b/src/process.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/puresize.h b/src/puresize.h
index 95f6ef6b620..49cb9b1b387 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/ralloc.c b/src/ralloc.c
index 7b319556117..e39ed5a4413 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/region-cache.c b/src/region-cache.c
index f30e00470f7..f36eea901b5 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/region-cache.h b/src/region-cache.h
index 27176d80dbc..8bfd7f04c3f 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index 204baa40f07..1110062605e 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/aix3-2.h b/src/s/aix3-2.h
index e745b8dc81b..140f4202806 100644
--- a/src/s/aix3-2.h
+++ b/src/s/aix3-2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/aix4-1.h b/src/s/aix4-1.h
index 49d866a7d7b..704550c80ee 100644
--- a/src/s/aix4-1.h
+++ b/src/s/aix4-1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/bsd386.h b/src/s/bsd386.h
index a3d0983ca25..1a2f7b7efa1 100644
--- a/src/s/bsd386.h
+++ b/src/s/bsd386.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index 2b11ba2302f..e82a06bd6ae 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index 40c655bea87..00c1d326527 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index 249cf34f41b..f0bb14af69c 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/cxux.h b/src/s/cxux.h
index daed2fc85d8..d5abebf1ae1 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index eff48e339cb..3c0d9c410a0 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/darwin.h b/src/s/darwin.h
index cb032429f7d..183aecaf5d8 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/dgux.h b/src/s/dgux.h
index 62194a2fc6e..f7ce0a6fd38 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/dgux4.h b/src/s/dgux4.h
index 01d75650e6f..bf5a1b0e597 100644
--- a/src/s/dgux4.h
+++ b/src/s/dgux4.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h
index c9f471af05a..d959b8c6f1b 100644
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h
index fef2da7d29d..570e90e9ac1 100644
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 3adca71bebc..a9604057c36 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 24a37f964db..64dbe201173 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/gnu.h b/src/s/gnu.h
index c4f1a798d9e..4d548838594 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/hiuxmpp.h b/src/s/hiuxmpp.h
index 7e05b2e8ca0..7538adb1634 100644
--- a/src/s/hiuxmpp.h
+++ b/src/s/hiuxmpp.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/hiuxwe2.h b/src/s/hiuxwe2.h
index 68973d19cd3..418ea14cc99 100644
--- a/src/s/hiuxwe2.h
+++ b/src/s/hiuxwe2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/hpux.h b/src/s/hpux.h
index c0419fbad46..5f407a661e1 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/hpux10.h b/src/s/hpux10.h
index 8f9e87a67a1..8edcfa19633 100644
--- a/src/s/hpux10.h
+++ b/src/s/hpux10.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/hpux8.h b/src/s/hpux8.h
index d8d1bd368bb..ea8e30fb282 100644
--- a/src/s/hpux8.h
+++ b/src/s/hpux8.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/hpux9.h b/src/s/hpux9.h
index d34c56c345b..cc45673089f 100644
--- a/src/s/hpux9.h
+++ b/src/s/hpux9.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index abbd945ab2f..c3d16cbf611 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index 192118eeca7..85a13167ed0 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index 1512077fe49..b58283d584c 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/irix4-0.h b/src/s/irix4-0.h
index 6fbe2478966..35fcae95e43 100644
--- a/src/s/irix4-0.h
+++ b/src/s/irix4-0.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/irix5-0.h b/src/s/irix5-0.h
index a932e315784..e1aca546909 100644
--- a/src/s/irix5-0.h
+++ b/src/s/irix5-0.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/irix6-0.h b/src/s/irix6-0.h
index bc24474ba73..53fdbd1b8f7 100644
--- a/src/s/irix6-0.h
+++ b/src/s/irix6-0.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 9a53e16257e..ce92b4b430a 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/isc2-2.h b/src/s/isc2-2.h
index 3d456570709..34c79f17ea1 100644
--- a/src/s/isc2-2.h
+++ b/src/s/isc2-2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/isc3-0.h b/src/s/isc3-0.h
index 6b7d20a37d0..3df55031778 100644
--- a/src/s/isc3-0.h
+++ b/src/s/isc3-0.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/lynxos.h b/src/s/lynxos.h
index faa036037f5..b2bf5ba4186 100644
--- a/src/s/lynxos.h
+++ b/src/s/lynxos.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 666b70b1ea5..a5898410b3b 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 0bb5a678ae3..10246513811 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 5fab025ae2a..591c0548491 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index b548a47ffbe..9e149bc5ed0 100644
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 2923712d929..5a5dd6a3693 100644
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/osf1.h b/src/s/osf1.h
index 04670b3d9a5..7e55ce4fb6d 100644
--- a/src/s/osf1.h
+++ b/src/s/osf1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/ptx.h b/src/s/ptx.h
index edbbe5b2ac4..d192bd6098a 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/ptx4.h b/src/s/ptx4.h
index af59d399664..d955234afd4 100644
--- a/src/s/ptx4.h
+++ b/src/s/ptx4.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h
index 682ba06720a..cccbbd3b2c8 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -1,24 +1,4 @@
-/* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3)
- Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
-
+/* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3) */
#define RISCiX_1_1 1
#define RISCiX 11
diff --git a/src/s/riscix12.h b/src/s/riscix12.h
index d082e442810..cc81c7da1c7 100644
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/rtu.h b/src/s/rtu.h
index 1517165877b..6dd8fa5a208 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/sco4.h b/src/s/sco4.h
index 96e812ce0e4..4912b275aaa 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/sco5.h b/src/s/sco5.h
index 6ab7b60e466..a5cc19656ab 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/sol2-3.h b/src/s/sol2-3.h
index 08964d733e2..ca9aa84ad6a 100644
--- a/src/s/sol2-3.h
+++ b/src/s/sol2-3.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/sol2.h b/src/s/sol2.h
index 711d12123a3..73662c0fa31 100644
--- a/src/s/sol2.h
+++ b/src/s/sol2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/sunos4-0.h b/src/s/sunos4-0.h
index a107b609a0c..bf77812f32c 100644
--- a/src/s/sunos4-0.h
+++ b/src/s/sunos4-0.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/sunos4shr.h b/src/s/sunos4shr.h
index aac3340a029..5ebbae3a0a2 100644
--- a/src/s/sunos4shr.h
+++ b/src/s/sunos4shr.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/template.h b/src/s/template.h
index c16b12971ad..23e1372aeda 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/umax.h b/src/s/umax.h
index 5d379ea398a..aa73faa4917 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index 0d4aba8ea2b..5730fa65284 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index 101e75726ef..9babf201e9f 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index b2c89a1abdc..607c0c61904 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 13a9885fb53..36588aecb9b 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index 0e0a1c84829..d9b53718488 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-4-2.h b/src/s/usg5-4-2.h
index 56b2a345814..b1616941da9 100644
--- a/src/s/usg5-4-2.h
+++ b/src/s/usg5-4-2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 4ca5b6fcabc..3dc05f3e9fd 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/vms.h b/src/s/vms.h
index 4d9bbaebb07..c526b6c5135 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/xenix.h b/src/s/xenix.h
index 6d77ef50acc..c5b3cf225e0 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/scroll.c b/src/scroll.c
index 3afc927c77f..48a40fe23d2 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/search.c b/src/search.c
index 154f6c80e2d..4ae3a68b304 100644
--- a/src/search.c
+++ b/src/search.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/sheap.c b/src/sheap.c
index 510a75d4743..5d54a0edc45 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/sound.c b/src/sound.c
index 5a27e7a6232..8b1bda8d6ef 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/sunfns.c b/src/sunfns.c
index 2d96ac66aef..86e64cbcdcc 100644
--- a/src/sunfns.c
+++ b/src/sunfns.c
@@ -16,7 +16,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/syntax.c b/src/syntax.c
index 9161512a15b..4afaeda82db 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/syntax.h b/src/syntax.h
index f64aa0e1327..4026eeaee8f 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/sysdep.c b/src/sysdep.c
index 95ad90c2a1b..f2170dabed7 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/sysselect.h b/src/sysselect.h
index d72ff90ac0b..bb27f5e1e0a 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/syssignal.h b/src/syssignal.h
index 36292670bc6..b52e2dd4b95 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/systime.h b/src/systime.h
index ac28d883d64..85c2799f083 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/systty.h b/src/systty.h
index d1eb3b84597..15dd7a4e26c 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/syswait.h b/src/syswait.h
index e70e992d545..7d0e667da96 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/term.c b/src/term.c
index b88448fc446..798fc37ca46 100644
--- a/src/term.c
+++ b/src/term.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/termchar.h b/src/termchar.h
index d5843bcf659..c4bf2adb0bd 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/termhooks.h b/src/termhooks.h
index ee6e707e6b5..889c3ab1ab7 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/terminfo.c b/src/terminfo.c
index 99f8b9a1e4e..c28e26b9d68 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/termopts.h b/src/termopts.h
index dff634b5192..210236017d5 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/textprop.c b/src/textprop.c
index b98acaeccd8..711ee571af6 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/uaf.h b/src/uaf.h
index c00fc7732fe..96a9eea7619 100644
--- a/src/uaf.h
+++ b/src/uaf.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/undo.c b/src/undo.c
index 7a6ba37d0f8..adc12193fd4 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexaix.c b/src/unexaix.c
index 41324ac0fd8..f17922abf4f 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexalpha.c b/src/unexalpha.c
index cbd44616bd4..4b54d4a0fa8 100644
--- a/src/unexalpha.c
+++ b/src/unexalpha.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexapollo.c b/src/unexapollo.c
index 27cf968c5fe..4facf823e19 100644
--- a/src/unexapollo.c
+++ b/src/unexapollo.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexconvex.c b/src/unexconvex.c
index 598b1b3428b..5682047d4fe 100644
--- a/src/unexconvex.c
+++ b/src/unexconvex.c
@@ -14,7 +14,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexcw.c b/src/unexcw.c
index f1023d4b239..5c5c0135238 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexec.c b/src/unexec.c
index 16f9c96faa7..81d8e9b83a4 100644
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexelf.c b/src/unexelf.c
index 7b2c72f0fa9..f7d8d22cb5d 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexenix.c b/src/unexenix.c
index 4d4bec11eb6..343eb6dfbdc 100644
--- a/src/unexenix.c
+++ b/src/unexenix.c
@@ -13,7 +13,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index d38053c3155..e9664f94bbc 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexmips.c b/src/unexmips.c
index d80bc62277e..fe3f6676f7c 100644
--- a/src/unexmips.c
+++ b/src/unexmips.c
@@ -13,7 +13,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexnext.c b/src/unexnext.c
index 937e5d2b80b..1acd0b5aa22 100644
--- a/src/unexnext.c
+++ b/src/unexnext.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexsni.c b/src/unexsni.c
index def59c6ea84..bbf9287e1f2 100644
--- a/src/unexsni.c
+++ b/src/unexsni.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexsunos4.c b/src/unexsunos4.c
index e8051fc7e88..e1066453f5b 100644
--- a/src/unexsunos4.c
+++ b/src/unexsunos4.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/unexw32.c b/src/unexw32.c
index ae2fe942c73..fb4956ac432 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/vm-limit.c b/src/vm-limit.c
index 192775df81c..5cb80cfa1c4 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w16select.c b/src/w16select.c
index 82619c15833..a66fba7d078 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32.c b/src/w32.c
index 206be4fa4e5..d7e95aac7d1 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32.h b/src/w32.h
index b6fb23dc14d..0c9c3ae3d5b 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -9,7 +9,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 40e705a18c9..80ef098d8de 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32bdf.h b/src/w32bdf.h
index ba408793882..36d6329645f 100644
--- a/src/w32bdf.h
+++ b/src/w32bdf.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32console.c b/src/w32console.c
index d2f0e06a64d..3afa5fb392a 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32gui.h b/src/w32gui.h
index 18c737a6e12..484f15911bc 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32heap.c b/src/w32heap.c
index 9327e7e7e7e..3b6f02d9d79 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32heap.h b/src/w32heap.h
index 0d4ccb70b8a..0d990305e8d 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32inevt.c b/src/w32inevt.c
index b44054afef3..fa2d34c2998 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32inevt.h b/src/w32inevt.h
index f0f7f232261..53f36e3a348 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32menu.c b/src/w32menu.c
index d8d6fa186bd..f0d582d388a 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32proc.c b/src/w32proc.c
index 8c99a0a1dff..adf5152f267 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32reg.c b/src/w32reg.c
index 37659ecb9ca..1bea4795be9 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32select.c b/src/w32select.c
index ad5d0e67f83..0690204ad72 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32term.c b/src/w32term.c
index 8ca35968a56..129f52dcfe0 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32term.h b/src/w32term.h
index cac3e2f8997..3bf7d588501 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/w32xfns.c b/src/w32xfns.c
index b87cc28f057..9d50676f921 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/widget.c b/src/widget.c
index e6388a7d158..714da205a67 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/widget.h b/src/widget.h
index 21cd4543230..63b832a3632 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/widgetprv.h b/src/widgetprv.h
index ac845209ba6..3cd9fd81231 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/window.c b/src/window.c
index 3d4efb7b203..f1c3a6e49f2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/window.h b/src/window.h
index d4f28034b19..7fc97448757 100644
--- a/src/window.h
+++ b/src/window.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/xdisp.c b/src/xdisp.c
index f53e528d6e8..41105456d95 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/xfaces.c b/src/xfaces.c
index b30d673241f..ffaf2afda21 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/xfns.c b/src/xfns.c
index a180c08e6da..0c06abb44d4 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/xmenu.c b/src/xmenu.c
index 6d9278e3c54..f68f3a41e3f 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/xrdb.c b/src/xrdb.c
index 4c9f3c60b35..79f1da81a41 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/xselect.c b/src/xselect.c
index 17dc7c0e7d3..729c05f190a 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 5a3fdbb8812..1211c55eb03 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/xterm.c b/src/xterm.c
index 2e8fca79156..bc70bb05ac4 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/xterm.h b/src/xterm.h
index 1f2e7a07097..70e0522e9cc 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,