aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-07-25 05:08:27 +0000
committerGlenn Morris2007-07-25 05:08:27 +0000
commit4a9f99bdfb808930e6e86eaa668594e19218eb3d (patch)
treead0a7852358abc3bce365c3fcf7f5b3600464a0a
parent405b8717906649b7ea07d13595627af159b1a330 (diff)
downloademacs-4a9f99bdfb808930e6e86eaa668594e19218eb3d.tar.gz
emacs-4a9f99bdfb808930e6e86eaa668594e19218eb3d.zip
Switch license to GPLv3 or later.
-rw-r--r--admin/ChangeLog2
-rw-r--r--admin/README2
-rw-r--r--admin/admin.el2
-rw-r--r--admin/alloc-colors.c2
-rwxr-xr-xadmin/build-configs2
-rw-r--r--admin/cus-test.el2
-rwxr-xr-xadmin/diff-tar-files2
-rwxr-xr-xadmin/make-announcement2
-rwxr-xr-xadmin/make-emacs2
-rwxr-xr-xadmin/quick-install-emacs2
-rwxr-xr-xadmin/revdiff2
-rw-r--r--lib-src/ChangeLog2
-rw-r--r--lib-src/Makefile.in2
-rw-r--r--lib-src/b2m.pl10
-rw-r--r--lib-src/cvtmail.c2
-rw-r--r--lib-src/digest-doc.c2
-rw-r--r--lib-src/ebrowse.c2
-rw-r--r--lib-src/emacsclient.c2
-rw-r--r--lib-src/emacstool.c2
-rw-r--r--lib-src/etags.c9
-rw-r--r--lib-src/fakemail.c2
-rw-r--r--lib-src/getopt.c2
-rw-r--r--lib-src/getopt1.c2
-rw-r--r--lib-src/getopt_.h2
-rw-r--r--lib-src/getopt_int.h2
-rw-r--r--lib-src/gettext.h2
-rwxr-xr-xlib-src/grep-changelog2
-rw-r--r--lib-src/hexl.c9
-rw-r--r--lib-src/make-docfile.c2
-rw-r--r--lib-src/makefile.w32-in2
-rw-r--r--lib-src/movemail.c2
-rw-r--r--lib-src/ntlib.c2
-rw-r--r--lib-src/ntlib.h2
-rw-r--r--lib-src/pop.c2
-rw-r--r--lib-src/pop.h2
-rw-r--r--lib-src/profile.c2
-rwxr-xr-xlib-src/rcs-checkin2
-rwxr-xr-xlib-src/rcs2log2
-rw-r--r--lib-src/sorted-doc.c2
-rw-r--r--lib-src/test-distrib.c2
-rw-r--r--lib-src/update-game-score.c2
-rwxr-xr-xlib-src/vcdiff2
-rw-r--r--lispintro/ChangeLog2
-rw-r--r--lispintro/Makefile.in2
-rw-r--r--lispintro/README2
-rw-r--r--lispintro/cons-1.eps2
-rw-r--r--lispintro/cons-2.eps2
-rw-r--r--lispintro/cons-3.eps2
-rw-r--r--lispintro/cons-4.eps2
-rw-r--r--lispintro/cons-5.eps2
-rw-r--r--lispintro/drawers.eps2
-rw-r--r--lispintro/lambda-1.eps2
-rw-r--r--lispintro/lambda-2.eps2
-rw-r--r--lispintro/lambda-3.eps2
-rw-r--r--lispintro/makefile.w32-in2
-rw-r--r--lispref/ChangeLog2
-rw-r--r--lispref/Makefile.in2
-rw-r--r--lispref/README2
-rw-r--r--lispref/makefile.w32-in2
-rw-r--r--lispref/two-volume-cross-refs.txt2
-rw-r--r--lispref/two-volume.make2
-rw-r--r--lispref/two.el2
-rw-r--r--lwlib/ChangeLog2
-rw-r--r--mac/ChangeLog2
-rw-r--r--mac/Emacs.app/Contents/Info.plist2
-rw-r--r--mac/INSTALL2
-rw-r--r--mac/README2
-rw-r--r--mac/cw6-mcp.xml2
-rw-r--r--mac/inc/alloca.h2
-rw-r--r--mac/inc/config.h2
-rw-r--r--mac/inc/defs-cw6.h2
-rw-r--r--mac/inc/dirent.h2
-rw-r--r--mac/inc/epaths.h2
-rwxr-xr-xmac/inc/grp.h2
-rw-r--r--mac/inc/m-mac.h2
-rw-r--r--mac/inc/pwd.h2
-rw-r--r--mac/inc/s-mac.h2
-rw-r--r--mac/inc/sys/file.h2
-rw-r--r--mac/inc/sys/ioctl.h2
-rw-r--r--mac/inc/sys/param.h2
-rw-r--r--mac/inc/sys/stat.h2
-rw-r--r--mac/inc/sys/time.h2
-rw-r--r--mac/inc/sys/types.h2
-rw-r--r--mac/inc/termio.h2
-rw-r--r--mac/inc/utime.h2
-rw-r--r--mac/inc/utsname.h2
-rwxr-xr-xmac/make-package2
-rw-r--r--mac/makefile.MPW2
-rw-r--r--mac/src/Emacs.r2
-rw-r--r--mac/src/EmacsMPW.r2
-rw-r--r--mac/src/chdir.c2
-rw-r--r--man/ChangeLog2
-rw-r--r--man/Makefile.in2
-rw-r--r--man/makefile.w32-in2
-rw-r--r--man/mh-e.texi2
-rw-r--r--msdos/ChangeLog2
-rw-r--r--msdos/README2
-rw-r--r--msdos/mainmake2
-rw-r--r--msdos/mainmake.v22
-rw-r--r--nt/ChangeLog2
-rw-r--r--nt/INSTALL2
-rw-r--r--nt/README2
-rw-r--r--nt/addpm.c2
-rw-r--r--nt/addsection.c2
-rw-r--r--nt/cmdproxy.c2
-rw-r--r--nt/config.nt2
-rwxr-xr-xnt/configure.bat2
-rw-r--r--nt/ddeclient.c2
-rw-r--r--nt/envadd.bat2
-rw-r--r--nt/gmake.defs2
-rw-r--r--nt/icons/README6
-rwxr-xr-xnt/inc/grp.h2
-rw-r--r--nt/inc/langinfo.h2
-rw-r--r--nt/inc/nl_types.h2
-rw-r--r--nt/inc/sys/socket.h2
-rw-r--r--nt/makefile.w32-in2
-rw-r--r--nt/multi-install-info.bat2
-rw-r--r--nt/nmake.defs2
-rw-r--r--nt/paths.h2
-rw-r--r--nt/preprep.c2
-rw-r--r--nt/runemacs.c2
-rw-r--r--oldXMenu/ChangeLog2
-rw-r--r--oldXMenu/descrip.mms2
-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/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.h2
-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--vms/make-mms-derivative.el2
272 files changed, 286 insertions, 284 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 0b316a83649..879143168e9 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -425,7 +425,7 @@
425 425
426 GNU Emacs is free software; you can redistribute it and/or modify 426 GNU Emacs is free software; you can redistribute it and/or modify
427 it under the terms of the GNU General Public License as published by 427 it under the terms of the GNU General Public License as published by
428 the Free Software Foundation; either version 2, or (at your option) 428 the Free Software Foundation; either version 3, or (at your option)
429 any later version. 429 any later version.
430 430
431 GNU Emacs is distributed in the hope that it will be useful, 431 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/README b/admin/README
index 8efcfa3224a..2c07f40b52f 100644
--- a/admin/README
+++ b/admin/README
@@ -71,7 +71,7 @@ This file is part of GNU Emacs.
71 71
72GNU Emacs is free software; you can redistribute it and/or modify 72GNU Emacs is free software; you can redistribute it and/or modify
73it under the terms of the GNU General Public License as published by 73it under the terms of the GNU General Public License as published by
74the Free Software Foundation; either version 2, or (at your option) 74the Free Software Foundation; either version 3, or (at your option)
75any later version. 75any later version.
76 76
77GNU Emacs is distributed in the hope that it will be useful, 77GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/admin.el b/admin/admin.el
index 342b40f9bde..67b0c161f5b 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -7,7 +7,7 @@
7 7
8;; GNU Emacs is free software; you can redistribute it and/or modify 8;; GNU Emacs is free software; you can redistribute it and/or modify
9;; it under the terms of the GNU General Public License as published by 9;; it under the terms of the GNU General Public License as published by
10;; the Free Software Foundation; either version 2, or (at your option) 10;; the Free Software Foundation; either version 3, or (at your option)
11;; any later version. 11;; any later version.
12 12
13;; GNU Emacs is distributed in the hope that it will be useful, 13;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index c336d808d58..22447643e5e 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/build-configs b/admin/build-configs
index b99b5405075..f36a05ca701 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -7,7 +7,7 @@
7# 7#
8# GNU Emacs is free software; you can redistribute it and/or modify 8# GNU Emacs is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2, or (at your option) 10# the Free Software Foundation; either version 3, or (at your option)
11# any later version. 11# any later version.
12# 12#
13# GNU Emacs is distributed in the hope that it will be useful, 13# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/cus-test.el b/admin/cus-test.el
index cba8e31ac89..ac0c7b37909 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 03b5a00a12f..18d95451751 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -7,7 +7,7 @@
7# 7#
8# GNU Emacs is free software; you can redistribute it and/or modify 8# GNU Emacs is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2, or (at your option) 10# the Free Software Foundation; either version 3, or (at your option)
11# any later version. 11# any later version.
12# 12#
13# GNU Emacs is distributed in the hope that it will be useful, 13# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/make-announcement b/admin/make-announcement
index 03a083e4c72..1c7b4574fea 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -9,7 +9,7 @@
9 9
10## GNU Emacs is free software; you can redistribute it and/or modify 10## GNU Emacs is free software; you can redistribute it and/or modify
11## it under the terms of the GNU General Public License as published by 11## it under the terms of the GNU General Public License as published by
12## the Free Software Foundation; either version 2, or (at your option) 12## the Free Software Foundation; either version 3, or (at your option)
13## any later version. 13## any later version.
14 14
15## GNU Emacs is distributed in the hope that it will be useful, 15## GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/make-emacs b/admin/make-emacs
index d6b14ca22b9..23b4e1c6374 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -7,7 +7,7 @@
7# 7#
8# GNU Emacs is free software; you can redistribute it and/or modify 8# GNU Emacs is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2, or (at your option) 10# the Free Software Foundation; either version 3, or (at your option)
11# any later version. 11# any later version.
12# 12#
13# GNU Emacs is distributed in the hope that it will be useful, 13# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index a6e70120e6d..e451cfcb2aa 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -10,7 +10,7 @@
10 10
11## GNU Emacs is free software; you can redistribute it and/or modify 11## GNU Emacs is free software; you can redistribute it and/or modify
12## it under the terms of the GNU General Public License as published by 12## it under the terms of the GNU General Public License as published by
13## the Free Software Foundation; either version 2, or (at your option) 13## the Free Software Foundation; either version 3, or (at your option)
14## any later version. 14## any later version.
15 15
16## GNU Emacs is distributed in the hope that it will be useful, 16## GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/revdiff b/admin/revdiff
index 78be1f62304..d9ea41782ba 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -7,7 +7,7 @@
7# 7#
8# GNU Emacs is free software; you can redistribute it and/or modify 8# GNU Emacs is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2, or (at your option) 10# the Free Software Foundation; either version 3, or (at your option)
11# any later version. 11# any later version.
12# 12#
13# GNU Emacs is distributed in the hope that it will be useful, 13# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 61975aa6cb8..0b1173059c5 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -6233,7 +6233,7 @@
6233 6233
6234 GNU Emacs is free software; you can redistribute it and/or modify 6234 GNU Emacs is free software; you can redistribute it and/or modify
6235 it under the terms of the GNU General Public License as published by 6235 it under the terms of the GNU General Public License as published by
6236 the Free Software Foundation; either version 2, or (at your option) 6236 the Free Software Foundation; either version 3, or (at your option)
6237 any later version. 6237 any later version.
6238 6238
6239 GNU Emacs is distributed in the hope that it will be useful, 6239 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index bef8f1b9c29..1482ea6c5df 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -6,7 +6,7 @@
6 6
7# GNU Emacs is free software; you can redistribute it and/or modify 7# GNU Emacs is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
9# the Free Software Foundation; either version 2, or (at your option) 9# the Free Software Foundation; either version 3, or (at your option)
10# any later version. 10# any later version.
11 11
12# GNU Emacs is distributed in the hope that it will be useful, 12# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index 39c5901348f..96f1643891f 100644
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -7,8 +7,8 @@
7 7
8# This program is free software; you can redistribute it and/or modify 8# This program is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2 of the License, or 10# the Free Software Foundation; either version 3, or (at your option)
11# (at your option) any later version. 11# any later version.
12 12
13# This program is distributed in the hope that it will be useful, but 13# This program is distributed in the hope that it will be useful, but
14# WITHOUT ANY WARRANTY; without even the implied warranty of 14# WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,9 @@
16# General Public License for more details. 16# General Public License for more details.
17 17
18# You should have received a copy of the GNU General Public License 18# You should have received a copy of the GNU General Public License
19# along with this program; if not, write to the Free Software 19# along with this program; see the file COPYING. If not, write to the
20# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 20# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21# USA. 21# Boston, MA 02110-1301 USA.
22 22
23# Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>. 23# Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>.
24 24
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index f82f877923e..d892d77dc5a 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c
index 16d386f5b4e..08e5d813361 100644
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -8,7 +8,7 @@
8 8
9 GNU Emacs is free software; you can redistribute it and/or modify 9 GNU Emacs is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by 10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2, or (at your option) 11 the Free Software Foundation; either version 3, or (at your option)
12 any later version. 12 any later version.
13 13
14 GNU Emacs is distributed in the hope that it will be useful, 14 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index b1348f8e841..ea230a9c3cd 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -7,7 +7,7 @@
7 7
8 GNU Emacs is free software; you can redistribute it and/or modify 8 GNU Emacs is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2, or (at your option) 10 the Free Software Foundation; either version 3, or (at your option)
11 any later version. 11 any later version.
12 12
13 GNU Emacs is distributed in the hope that it will be useful, 13 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index ea1e6cd7af8..9edba132134 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c
index f04a8b3f545..7b39d2ed8fd 100644
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 1d1f16ddf28..6c61847546a 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -36,8 +36,8 @@ This file is not considered part of GNU Emacs.
36 36
37This program is free software; you can redistribute it and/or modify 37This program is free software; you can redistribute it and/or modify
38it under the terms of the GNU General Public License as published by 38it under the terms of the GNU General Public License as published by
39the Free Software Foundation; either version 2 of the License, or 39the Free Software Foundation; either version 3, or (at your option)
40(at your option) any later version. 40any later version.
41 41
42This program is distributed in the hope that it will be useful, 42This program is distributed in the hope that it will be useful,
43but WITHOUT ANY WARRANTY; without even the implied warranty of 43but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,8 +45,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
45GNU General Public License for more details. 45GNU General Public License for more details.
46 46
47You should have received a copy of the GNU General Public License 47You should have received a copy of the GNU General Public License
48along with this program; if not, write to the Free Software Foundation, 48along with this program; see the file COPYING. If not, write to the
49Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ 49Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
50Boston, MA 02110-1301, USA. */
50 51
51 52
52/* NB To comply with the above BSD license, copyright information is 53/* NB To comply with the above BSD license, copyright information is
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index e35c0f8a072..003f2da886c 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index b6d6b881de7..587c2e0f618 100644
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -9,7 +9,7 @@
9 9
10 This program is free software; you can redistribute it and/or modify 10 This program is free software; you can redistribute it and/or modify
11 it under the terms of the GNU General Public License as published by 11 it under the terms of the GNU General Public License as published by
12 the Free Software Foundation; either version 2, or (at your option) 12 the Free Software Foundation; either version 3, or (at your option)
13 any later version. 13 any later version.
14 14
15 This program is distributed in the hope that it will be useful, 15 This program is distributed in the hope that it will be useful,
diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c
index c2bec4f8e9a..25f616250c1 100644
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -5,7 +5,7 @@
5 5
6 This program is free software; you can redistribute it and/or modify 6 This program is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 7 it under the terms of the GNU General Public License as published by
8 the Free Software Foundation; either version 2, or (at your option) 8 the Free Software Foundation; either version 3, or (at your option)
9 any later version. 9 any later version.
10 10
11 This program is distributed in the hope that it will be useful, 11 This program is distributed in the hope that it will be useful,
diff --git a/lib-src/getopt_.h b/lib-src/getopt_.h
index 377c4837548..7cccef3eeea 100644
--- a/lib-src/getopt_.h
+++ b/lib-src/getopt_.h
@@ -5,7 +5,7 @@
5 5
6 This program is free software; you can redistribute it and/or modify 6 This program is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 7 it under the terms of the GNU General Public License as published by
8 the Free Software Foundation; either version 2, or (at your option) 8 the Free Software Foundation; either version 3, or (at your option)
9 any later version. 9 any later version.
10 10
11 This program is distributed in the hope that it will be useful, 11 This program is distributed in the hope that it will be useful,
diff --git a/lib-src/getopt_int.h b/lib-src/getopt_int.h
index 25df3bbcfdc..049f4762900 100644
--- a/lib-src/getopt_int.h
+++ b/lib-src/getopt_int.h
@@ -5,7 +5,7 @@
5 5
6 This program is free software; you can redistribute it and/or modify 6 This program is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 7 it under the terms of the GNU General Public License as published by
8 the Free Software Foundation; either version 2, or (at your option) 8 the Free Software Foundation; either version 3, or (at your option)
9 any later version. 9 any later version.
10 10
11 This program is distributed in the hope that it will be useful, 11 This program is distributed in the hope that it will be useful,
diff --git a/lib-src/gettext.h b/lib-src/gettext.h
index ed329003843..4a5941f86dc 100644
--- a/lib-src/gettext.h
+++ b/lib-src/gettext.h
@@ -4,7 +4,7 @@
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2, or (at your option) 7 the Free Software Foundation; either version 3, or (at your option)
8 any later version. 8 any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index d2e9ecfd7ee..1dff1e3e6b7 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -7,7 +7,7 @@
7# 7#
8# GNU Emacs is free software; you can redistribute it and/or modify 8# GNU Emacs is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2, or (at your option) 10# the Free Software Foundation; either version 3, or (at your option)
11# any later version. 11# any later version.
12# 12#
13# GNU Emacs is distributed in the hope that it will be useful, 13# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 7cabdc95a66..98561cf604d 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -6,8 +6,8 @@ This file is not considered part of GNU Emacs.
6 6
7This program is free software; you can redistribute it and/or modify 7This program is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2 of the License, or 9the Free Software Foundation; either version 3, or (at your option)
10(at your option) any later version. 10any later version.
11 11
12This program is distributed in the hope that it will be useful, 12This program is distributed in the hope that it will be useful,
13but WITHOUT ANY WARRANTY; without even the implied warranty of 13but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15GNU General Public License for more details. 15GNU General Public License for more details.
16 16
17You should have received a copy of the GNU General Public License 17You should have received a copy of the GNU General Public License
18along with this program; if not, write to the Free Software Foundation, 18along with this program; see the file COPYING. If not, write to the
19Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ 19Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20Boston, MA 02110-1301, USA. */
20 21
21#ifdef HAVE_CONFIG_H 22#ifdef HAVE_CONFIG_H
22#include <config.h> 23#include <config.h>
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index d76bdd527cf..3f3da3e7007 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index b552160c759..3076b85dbd8 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -6,7 +6,7 @@
6# 6#
7# GNU Emacs is free software; you can redistribute it and/or modify 7# GNU Emacs is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
9# the Free Software Foundation; either version 2, or (at your option) 9# the Free Software Foundation; either version 3, or (at your option)
10# any later version. 10# any later version.
11# 11#
12# GNU Emacs is distributed in the hope that it will be useful, 12# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 84d4f949b2f..aaaf91b1b1f 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 5f6c12abceb..e11733f9605 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index a5655519fe1..267e8ba5a04 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -6,7 +6,7 @@
6 6
7 GNU Emacs is free software; you can redistribute it and/or modify it 7 GNU Emacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
9 Free Software Foundation; either version 2, or (at your option) any later 9 Free Software Foundation; either version 3, or (at your option) any later
10 version. 10 version.
11 11
12 GNU Emacs is distributed in the hope that it will be useful, but WITHOUT 12 GNU Emacs is distributed in the hope that it will be useful, but WITHOUT
diff --git a/lib-src/pop.c b/lib-src/pop.c
index a829607faa5..9fcbe4b370c 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 664fb26f7db..85b666c652f 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 1174666da78..628b72ddcfe 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index 1ec783934e6..94396709e65 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -9,7 +9,7 @@
9# 9#
10# GNU Emacs is free software; you can redistribute it and/or modify 10# GNU Emacs is free software; you can redistribute it and/or modify
11# it under the terms of the GNU General Public License as published by 11# it under the terms of the GNU General Public License as published by
12# the Free Software Foundation; either version 2, or (at your option) 12# the Free Software Foundation; either version 3, or (at your option)
13# any later version. 13# any later version.
14# 14#
15# GNU Emacs is distributed in the hope that it will be useful, 15# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 371a52de66c..c81f51d4d60 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -59,7 +59,7 @@ Id='$Id$'
59 59
60# This program is free software; you can redistribute it and/or modify 60# This program is free software; you can redistribute it and/or modify
61# it under the terms of the GNU General Public License as published by 61# it under the terms of the GNU General Public License as published by
62# the Free Software Foundation; either version 2, or (at your option) 62# the Free Software Foundation; either version 3, or (at your option)
63# any later version. 63# any later version.
64# 64#
65# This program is distributed in the hope that it will be useful, 65# This program is distributed in the hope that it will be useful,
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index 28f736ab843..e239eaab428 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -8,7 +8,7 @@
8 8
9 GNU Emacs is free software; you can redistribute it and/or modify 9 GNU Emacs is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by 10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2, or (at your option) 11 the Free Software Foundation; either version 3, or (at your option)
12 any later version. 12 any later version.
13 13
14 GNU Emacs is distributed in the hope that it will be useful, 14 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index cd504c8c538..4913f094614 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -7,7 +7,7 @@
7 7
8 GNU Emacs is free software; you can redistribute it and/or modify 8 GNU Emacs is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2, or (at your option) 10 the Free Software Foundation; either version 3, or (at your option)
11 any later version. 11 any later version.
12 12
13 GNU Emacs is distributed in the hope that it will be useful, 13 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 9f1c011ce79..3ccfecdb7d7 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 21c6e70e9d8..4fd6fb47226 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -10,7 +10,7 @@
10# 10#
11# GNU Emacs is free software; you can redistribute it and/or modify 11# GNU Emacs is free software; you can redistribute it and/or modify
12# it under the terms of the GNU General Public License as published by 12# it under the terms of the GNU General Public License as published by
13# the Free Software Foundation; either version 2, or (at your option) 13# the Free Software Foundation; either version 3, or (at your option)
14# any later version. 14# any later version.
15# 15#
16# GNU Emacs is distributed in the hope that it will be useful, 16# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog
index 2e08725df69..a7c0c7fd5cd 100644
--- a/lispintro/ChangeLog
+++ b/lispintro/ChangeLog
@@ -246,7 +246,7 @@
246 246
247 GNU Emacs is free software; you can redistribute it and/or modify 247 GNU Emacs is free software; you can redistribute it and/or modify
248 it under the terms of the GNU General Public License as published by 248 it under the terms of the GNU General Public License as published by
249 the Free Software Foundation; either version 2, or (at your option) 249 the Free Software Foundation; either version 3, or (at your option)
250 any later version. 250 any later version.
251 251
252 GNU Emacs is distributed in the hope that it will be useful, 252 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/Makefile.in b/lispintro/Makefile.in
index 13ff68fbb16..fc263c2095c 100644
--- a/lispintro/Makefile.in
+++ b/lispintro/Makefile.in
@@ -7,7 +7,7 @@
7 7
8# GNU Emacs is free software; you can redistribute it and/or modify 8# GNU Emacs is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2, or (at your option) 10# the Free Software Foundation; either version 3, or (at your option)
11# any later version. 11# any later version.
12 12
13# GNU Emacs is distributed in the hope that it will be useful, 13# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/README b/lispintro/README
index df8cdc5241e..5edd38af3ee 100644
--- a/lispintro/README
+++ b/lispintro/README
@@ -70,7 +70,7 @@ This file is part of GNU Emacs.
70 70
71GNU Emacs is free software; you can redistribute it and/or modify 71GNU Emacs is free software; you can redistribute it and/or modify
72it under the terms of the GNU General Public License as published by 72it under the terms of the GNU General Public License as published by
73the Free Software Foundation; either version 2, or (at your option) 73the Free Software Foundation; either version 3, or (at your option)
74any later version. 74any later version.
75 75
76GNU Emacs is distributed in the hope that it will be useful, 76GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/cons-1.eps b/lispintro/cons-1.eps
index ea2c4168956..95a74dcf298 100644
--- a/lispintro/cons-1.eps
+++ b/lispintro/cons-1.eps
@@ -14,7 +14,7 @@
14% 14%
15% GNU Emacs is free software; you can redistribute it and/or modify 15% GNU Emacs is free software; you can redistribute it and/or modify
16% it under the terms of the GNU General Public License as published by 16% it under the terms of the GNU General Public License as published by
17% the Free Software Foundation; either version 2, or (at your option) 17% the Free Software Foundation; either version 3, or (at your option)
18% any later version. 18% any later version.
19% 19%
20% GNU Emacs is distributed in the hope that it will be useful, 20% GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/cons-2.eps b/lispintro/cons-2.eps
index b6fb796b452..b8537d28ea8 100644
--- a/lispintro/cons-2.eps
+++ b/lispintro/cons-2.eps
@@ -14,7 +14,7 @@
14% 14%
15% GNU Emacs is free software; you can redistribute it and/or modify 15% GNU Emacs is free software; you can redistribute it and/or modify
16% it under the terms of the GNU General Public License as published by 16% it under the terms of the GNU General Public License as published by
17% the Free Software Foundation; either version 2, or (at your option) 17% the Free Software Foundation; either version 3, or (at your option)
18% any later version. 18% any later version.
19% 19%
20% GNU Emacs is distributed in the hope that it will be useful, 20% GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/cons-3.eps b/lispintro/cons-3.eps
index ea3f8d4c80d..795fa2b18f4 100644
--- a/lispintro/cons-3.eps
+++ b/lispintro/cons-3.eps
@@ -14,7 +14,7 @@
14% 14%
15% GNU Emacs is free software; you can redistribute it and/or modify 15% GNU Emacs is free software; you can redistribute it and/or modify
16% it under the terms of the GNU General Public License as published by 16% it under the terms of the GNU General Public License as published by
17% the Free Software Foundation; either version 2, or (at your option) 17% the Free Software Foundation; either version 3, or (at your option)
18% any later version. 18% any later version.
19% 19%
20% GNU Emacs is distributed in the hope that it will be useful, 20% GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/cons-4.eps b/lispintro/cons-4.eps
index 80947b45a8e..68b0a296c36 100644
--- a/lispintro/cons-4.eps
+++ b/lispintro/cons-4.eps
@@ -14,7 +14,7 @@
14% 14%
15% GNU Emacs is free software; you can redistribute it and/or modify 15% GNU Emacs is free software; you can redistribute it and/or modify
16% it under the terms of the GNU General Public License as published by 16% it under the terms of the GNU General Public License as published by
17% the Free Software Foundation; either version 2, or (at your option) 17% the Free Software Foundation; either version 3, or (at your option)
18% any later version. 18% any later version.
19% 19%
20% GNU Emacs is distributed in the hope that it will be useful, 20% GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/cons-5.eps b/lispintro/cons-5.eps
index a49bb062c16..e03815a4403 100644
--- a/lispintro/cons-5.eps
+++ b/lispintro/cons-5.eps
@@ -14,7 +14,7 @@
14% 14%
15% GNU Emacs is free software; you can redistribute it and/or modify 15% GNU Emacs is free software; you can redistribute it and/or modify
16% it under the terms of the GNU General Public License as published by 16% it under the terms of the GNU General Public License as published by
17% the Free Software Foundation; either version 2, or (at your option) 17% the Free Software Foundation; either version 3, or (at your option)
18% any later version. 18% any later version.
19% 19%
20% GNU Emacs is distributed in the hope that it will be useful, 20% GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/drawers.eps b/lispintro/drawers.eps
index b0f2f64e0a9..0e5a222ae45 100644
--- a/lispintro/drawers.eps
+++ b/lispintro/drawers.eps
@@ -16,7 +16,7 @@
16% 16%
17% GNU Emacs is free software; you can redistribute it and/or modify 17% GNU Emacs is free software; you can redistribute it and/or modify
18% it under the terms of the GNU General Public License as published by 18% it under the terms of the GNU General Public License as published by
19% the Free Software Foundation; either version 2, or (at your option) 19% the Free Software Foundation; either version 3, or (at your option)
20% any later version. 20% any later version.
21% 21%
22% GNU Emacs is distributed in the hope that it will be useful, 22% GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/lambda-1.eps b/lispintro/lambda-1.eps
index 14780fefe76..5b1b5d04299 100644
--- a/lispintro/lambda-1.eps
+++ b/lispintro/lambda-1.eps
@@ -14,7 +14,7 @@
14% 14%
15% GNU Emacs is free software; you can redistribute it and/or modify 15% GNU Emacs is free software; you can redistribute it and/or modify
16% it under the terms of the GNU General Public License as published by 16% it under the terms of the GNU General Public License as published by
17% the Free Software Foundation; either version 2, or (at your option) 17% the Free Software Foundation; either version 3, or (at your option)
18% any later version. 18% any later version.
19% 19%
20% GNU Emacs is distributed in the hope that it will be useful, 20% GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/lambda-2.eps b/lispintro/lambda-2.eps
index 5d2717342ac..6288283abce 100644
--- a/lispintro/lambda-2.eps
+++ b/lispintro/lambda-2.eps
@@ -14,7 +14,7 @@
14% 14%
15% GNU Emacs is free software; you can redistribute it and/or modify 15% GNU Emacs is free software; you can redistribute it and/or modify
16% it under the terms of the GNU General Public License as published by 16% it under the terms of the GNU General Public License as published by
17% the Free Software Foundation; either version 2, or (at your option) 17% the Free Software Foundation; either version 3, or (at your option)
18% any later version. 18% any later version.
19% 19%
20% GNU Emacs is distributed in the hope that it will be useful, 20% GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/lambda-3.eps b/lispintro/lambda-3.eps
index 4f16e9d9185..26f7d5d9644 100644
--- a/lispintro/lambda-3.eps
+++ b/lispintro/lambda-3.eps
@@ -14,7 +14,7 @@
14% 14%
15% GNU Emacs is free software; you can redistribute it and/or modify 15% GNU Emacs is free software; you can redistribute it and/or modify
16% it under the terms of the GNU General Public License as published by 16% it under the terms of the GNU General Public License as published by
17% the Free Software Foundation; either version 2, or (at your option) 17% the Free Software Foundation; either version 3, or (at your option)
18% any later version. 18% any later version.
19% 19%
20% GNU Emacs is distributed in the hope that it will be useful, 20% GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in
index 579d93481b6..07d51d24620 100644
--- a/lispintro/makefile.w32-in
+++ b/lispintro/makefile.w32-in
@@ -6,7 +6,7 @@
6 6
7# GNU Emacs is free software; you can redistribute it and/or modify 7# GNU Emacs is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
9# the Free Software Foundation; either version 2, or (at your option) 9# the Free Software Foundation; either version 3, or (at your option)
10# any later version. 10# any later version.
11 11
12# GNU Emacs is distributed in the hope that it will be useful, 12# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 61ee06011e6..41c71a6ae08 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -6116,7 +6116,7 @@ Tue Apr 11 12:23:28 1989 Robert J. Chassell (bob@rice-chex.ai.mit.edu)
6116 6116
6117 GNU Emacs is free software; you can redistribute it and/or modify 6117 GNU Emacs is free software; you can redistribute it and/or modify
6118 it under the terms of the GNU General Public License as published by 6118 it under the terms of the GNU General Public License as published by
6119 the Free Software Foundation; either version 2, or (at your option) 6119 the Free Software Foundation; either version 3, or (at your option)
6120 any later version. 6120 any later version.
6121 6121
6122 GNU Emacs is distributed in the hope that it will be useful, 6122 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index 9abd45f8f15..1a34d60a0d8 100644
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -7,7 +7,7 @@
7 7
8# GNU Emacs is free software; you can redistribute it and/or modify 8# GNU Emacs is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2, or (at your option) 10# the Free Software Foundation; either version 3, or (at your option)
11# any later version. 11# any later version.
12 12
13# GNU Emacs is distributed in the hope that it will be useful, 13# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispref/README b/lispref/README
index 564c349256e..c5d4c8acc77 100644
--- a/lispref/README
+++ b/lispref/README
@@ -58,7 +58,7 @@ This file is part of GNU Emacs.
58 58
59GNU Emacs is free software; you can redistribute it and/or modify 59GNU Emacs is free software; you can redistribute it and/or modify
60it under the terms of the GNU General Public License as published by 60it under the terms of the GNU General Public License as published by
61the Free Software Foundation; either version 2, or (at your option) 61the Free Software Foundation; either version 3, or (at your option)
62any later version. 62any later version.
63 63
64GNU Emacs is distributed in the hope that it will be useful, 64GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
index dc312691dab..7e35339d17f 100644
--- a/lispref/makefile.w32-in
+++ b/lispref/makefile.w32-in
@@ -6,7 +6,7 @@
6 6
7# GNU Emacs is free software; you can redistribute it and/or modify 7# GNU Emacs is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
9# the Free Software Foundation; either version 2, or (at your option) 9# the Free Software Foundation; either version 3, or (at your option)
10# any later version. 10# any later version.
11 11
12# GNU Emacs is distributed in the hope that it will be useful, 12# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispref/two-volume-cross-refs.txt b/lispref/two-volume-cross-refs.txt
index 1e923cab8e6..6e40920cf66 100644
--- a/lispref/two-volume-cross-refs.txt
+++ b/lispref/two-volume-cross-refs.txt
@@ -308,7 +308,7 @@ COPYING CONDITIONS
308 308
309This file is free software; you can redistribute it and/or modify 309This file is free software; you can redistribute it and/or modify
310it under the terms of the GNU General Public License as published by 310it under the terms of the GNU General Public License as published by
311the Free Software Foundation; either version 2, or (at your option) 311the Free Software Foundation; either version 3, or (at your option)
312any later version. 312any later version.
313 313
314This file is distributed in the hope that it will be useful, 314This file is distributed in the hope that it will be useful,
diff --git a/lispref/two-volume.make b/lispref/two-volume.make
index 5b531ab87a5..b2550576825 100644
--- a/lispref/two-volume.make
+++ b/lispref/two-volume.make
@@ -211,7 +211,7 @@ elisp2-init: vol2.texi
211# 211#
212# This file is free software; you can redistribute it and/or modify 212# This file is free software; you can redistribute it and/or modify
213# it under the terms of the GNU General Public License as published by 213# it under the terms of the GNU General Public License as published by
214# the Free Software Foundation; either version 2, or (at your option) 214# the Free Software Foundation; either version 3, or (at your option)
215# any later version. 215# any later version.
216# 216#
217# This file is distributed in the hope that it will be useful, 217# This file is distributed in the hope that it will be useful,
diff --git a/lispref/two.el b/lispref/two.el
index 5f8fca8c54b..baade844463 100644
--- a/lispref/two.el
+++ b/lispref/two.el
@@ -7,7 +7,7 @@
7 7
8;; This file is free software; you can redistribute it and/or modify 8;; This file is free software; you can redistribute it and/or modify
9;; it under the terms of the GNU General Public License as published by 9;; it under the terms of the GNU General Public License as published by
10;; the Free Software Foundation; either version 2, or (at your option) 10;; the Free Software Foundation; either version 3, or (at your option)
11;; any later version. 11;; any later version.
12 12
13;; This file is distributed in the hope that it will be useful, 13;; This file is distributed in the hope that it will be useful,
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index f6764e87e17..5059fe32b37 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1350,7 +1350,7 @@
1350 1350
1351 GNU Emacs is free software; you can redistribute it and/or modify 1351 GNU Emacs is free software; you can redistribute it and/or modify
1352 it under the terms of the GNU General Public License as published by 1352 it under the terms of the GNU General Public License as published by
1353 the Free Software Foundation; either version 2, or (at your option) 1353 the Free Software Foundation; either version 3, or (at your option)
1354 any later version. 1354 any later version.
1355 1355
1356 GNU Emacs is distributed in the hope that it will be useful, 1356 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/ChangeLog b/mac/ChangeLog
index 5eb769f3a74..87edc913b05 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -905,7 +905,7 @@
905 905
906 GNU Emacs is free software; you can redistribute it and/or modify 906 GNU Emacs is free software; you can redistribute it and/or modify
907 it under the terms of the GNU General Public License as published by 907 it under the terms of the GNU General Public License as published by
908 the Free Software Foundation; either version 2, or (at your option) 908 the Free Software Foundation; either version 3, or (at your option)
909 any later version. 909 any later version.
910 910
911 GNU Emacs is distributed in the hope that it will be useful, 911 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist
index c27500678b8..ed2c4a8bf7c 100644
--- a/mac/Emacs.app/Contents/Info.plist
+++ b/mac/Emacs.app/Contents/Info.plist
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify it 7GNU Emacs is free software; you can redistribute it and/or modify it
8under the terms of the GNU General Public License as published by the 8under the terms of the GNU General Public License as published by the
9Free Software Foundation; either version 2, or (at your option) any 9Free Software Foundation; either version 3, or (at your option) any
10later version. 10later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, but 12GNU Emacs is distributed in the hope that it will be useful, but
diff --git a/mac/INSTALL b/mac/INSTALL
index 302317b025f..7cdf0de4940 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -220,7 +220,7 @@ This file is part of GNU Emacs.
220 220
221GNU Emacs is free software; you can redistribute it and/or modify 221GNU Emacs is free software; you can redistribute it and/or modify
222it under the terms of the GNU General Public License as published by 222it under the terms of the GNU General Public License as published by
223the Free Software Foundation; either version 2, or (at your option) 223the Free Software Foundation; either version 3, or (at your option)
224any later version. 224any later version.
225 225
226GNU Emacs is distributed in the hope that it will be useful, 226GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/README b/mac/README
index 1d8cc40e545..f02527d6383 100644
--- a/mac/README
+++ b/mac/README
@@ -49,7 +49,7 @@ This file is part of GNU Emacs.
49 49
50GNU Emacs is free software; you can redistribute it and/or modify 50GNU Emacs is free software; you can redistribute it and/or modify
51it under the terms of the GNU General Public License as published by 51it under the terms of the GNU General Public License as published by
52the Free Software Foundation; either version 2, or (at your option) 52the Free Software Foundation; either version 3, or (at your option)
53any later version. 53any later version.
54 54
55GNU Emacs is distributed in the hope that it will be useful, 55GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/cw6-mcp.xml b/mac/cw6-mcp.xml
index 38f12ba2e74..410f512e37a 100644
--- a/mac/cw6-mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify it 7GNU Emacs is free software; you can redistribute it and/or modify it
8under the terms of the GNU General Public License as published by the 8under the terms of the GNU General Public License as published by the
9Free Software Foundation; either version 2, or (at your option) any 9Free Software Foundation; either version 3, or (at your option) any
10later version. 10later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, but 12GNU Emacs is distributed in the hope that it will be useful, but
diff --git a/mac/inc/alloca.h b/mac/inc/alloca.h
index 9ce323d0f77..f0c47e1f7ba 100644
--- a/mac/inc/alloca.h
+++ b/mac/inc/alloca.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify it 6GNU Emacs is free software; you can redistribute it and/or modify it
7under the terms of the GNU General Public License as published by the 7under the terms of the GNU General Public License as published by the
8Free Software Foundation; either version 2, or (at your option) any 8Free Software Foundation; either version 3, or (at your option) any
9later version. 9later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, but 11GNU Emacs is distributed in the hope that it will be useful, but
diff --git a/mac/inc/config.h b/mac/inc/config.h
index b9fb9a6d8cf..ae741b0681f 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/defs-cw6.h b/mac/inc/defs-cw6.h
index e72cd9e5f73..05dfa901a24 100644
--- a/mac/inc/defs-cw6.h
+++ b/mac/inc/defs-cw6.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify it 6GNU Emacs is free software; you can redistribute it and/or modify it
7under the terms of the GNU General Public License as published by the 7under the terms of the GNU General Public License as published by the
8Free Software Foundation; either version 2, or (at your option) any 8Free Software Foundation; either version 3, or (at your option) any
9later version. 9later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, but 11GNU Emacs is distributed in the hope that it will be useful, but
diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h
index 40ec3467081..0efaf879466 100644
--- a/mac/inc/dirent.h
+++ b/mac/inc/dirent.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h
index 2c29f98f5c8..e9ee0a9fb70 100644
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/grp.h b/mac/inc/grp.h
index b4311f5ee1c..f8e93b5d2c1 100755
--- a/mac/inc/grp.h
+++ b/mac/inc/grp.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h
index 544e5d0187d..a5a26cd000c 100644
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/pwd.h b/mac/inc/pwd.h
index 239b915430b..c992b5c4ea9 100644
--- a/mac/inc/pwd.h
+++ b/mac/inc/pwd.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/s-mac.h b/mac/inc/s-mac.h
index 83715a7ea06..4798fb9c3bd 100644
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/sys/file.h b/mac/inc/sys/file.h
index 4b320eaea2f..e720fc1c0ce 100644
--- a/mac/inc/sys/file.h
+++ b/mac/inc/sys/file.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h
index e2fca68f021..d0caa4b0eb7 100644
--- a/mac/inc/sys/ioctl.h
+++ b/mac/inc/sys/ioctl.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/sys/param.h b/mac/inc/sys/param.h
index b4f93fa924e..265f5384c9c 100644
--- a/mac/inc/sys/param.h
+++ b/mac/inc/sys/param.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/sys/stat.h b/mac/inc/sys/stat.h
index 4a9cd5fcdc1..0e352211e16 100644
--- a/mac/inc/sys/stat.h
+++ b/mac/inc/sys/stat.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/sys/time.h b/mac/inc/sys/time.h
index 14579bea4e4..057ecca42be 100644
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/sys/types.h b/mac/inc/sys/types.h
index 27c85643124..bec6e4c773b 100644
--- a/mac/inc/sys/types.h
+++ b/mac/inc/sys/types.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/termio.h b/mac/inc/termio.h
index 26f4d0a975a..34e034c2fd1 100644
--- a/mac/inc/termio.h
+++ b/mac/inc/termio.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/utime.h b/mac/inc/utime.h
index 66fb3cf3afd..2deefbb9617 100644
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/inc/utsname.h b/mac/inc/utsname.h
index e34e2ebbd1b..174d9cffe85 100644
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/make-package b/mac/make-package
index 1db34d2046c..2d10710da80 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -24,7 +24,7 @@
24# 24#
25# GNU Emacs is free software; you can redistribute it and/or modify 25# GNU Emacs is free software; you can redistribute it and/or modify
26# it under the terms of the GNU General Public License as published by 26# it under the terms of the GNU General Public License as published by
27# the Free Software Foundation; either version 2, or (at your option) 27# the Free Software Foundation; either version 3, or (at your option)
28# any later version. 28# any later version.
29# 29#
30# GNU Emacs is distributed in the hope that it will be useful, 30# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index cbfbff76b72..9c03942effa 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -8,7 +8,7 @@
8# 8#
9# GNU Emacs is free software; you can redistribute it and/or modify 9# GNU Emacs is free software; you can redistribute it and/or modify
10# it under the terms of the GNU General Public License as published by 10# it under the terms of the GNU General Public License as published by
11# the Free Software Foundation; either version 2, or (at your option) 11# the Free Software Foundation; either version 3, or (at your option)
12# any later version. 12# any later version.
13# 13#
14# GNU Emacs is distributed in the hope that it will be useful, 14# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 27d91b59ea0..21204ea22bb 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r
index 4d6faa25a84..f017f2bec78 100644
--- a/mac/src/EmacsMPW.r
+++ b/mac/src/EmacsMPW.r
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU Emacs is distributed in the hope that it will be useful,
diff --git a/mac/src/chdir.c b/mac/src/chdir.c
index e1b112c7bf4..eb0670f3fd5 100644
--- a/mac/src/chdir.c
+++ b/mac/src/chdir.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/man/ChangeLog b/man/ChangeLog
index 6b3b8d251e9..b36abb666cd 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -7985,7 +7985,7 @@
7985 7985
7986 GNU Emacs is free software; you can redistribute it and/or modify 7986 GNU Emacs is free software; you can redistribute it and/or modify
7987 it under the terms of the GNU General Public License as published by 7987 it under the terms of the GNU General Public License as published by
7988 the Free Software Foundation; either version 2, or (at your option) 7988 the Free Software Foundation; either version 3, or (at your option)
7989 any later version. 7989 any later version.
7990 7990
7991 GNU Emacs is distributed in the hope that it will be useful, 7991 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/man/Makefile.in b/man/Makefile.in
index 94ace126537..f52ac990b7c 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -7,7 +7,7 @@
7 7
8# GNU Emacs is free software; you can redistribute it and/or modify 8# GNU Emacs is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2, or (at your option) 10# the Free Software Foundation; either version 3, or (at your option)
11# any later version. 11# any later version.
12 12
13# GNU Emacs is distributed in the hope that it will be useful, 13# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/man/makefile.w32-in b/man/makefile.w32-in
index 2e559a62906..7e3723c1949 100644
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -6,7 +6,7 @@
6 6
7# GNU Emacs is free software; you can redistribute it and/or modify 7# GNU Emacs is free software; you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
9# the Free Software Foundation; either version 2, or (at your option) 9# the Free Software Foundation; either version 3, or (at your option)
10# any later version. 10# any later version.
11 11
12# GNU Emacs is distributed in the hope that it will be useful, 12# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/man/mh-e.texi b/man/mh-e.texi
index 76697cbdcf5..6832eb1e05c 100644
--- a/man/mh-e.texi
+++ b/man/mh-e.texi
@@ -39,7 +39,7 @@ no Front-Cover Texts, and no Back-Cover Texts.
39 39
40@item 40@item
41the GNU General Public License as published by the Free Software 41the GNU General Public License as published by the Free Software
42Foundation; either version 2, or (at your option) any later version. 42Foundation; either version 3, or (at your option) any later version.
43@end enumerate 43@end enumerate
44 44
45The MH-E manual is distributed in the hope that it will be useful, but 45The MH-E manual is distributed in the hope that it will be useful, but
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 4c7c136c187..6ce19812eac 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -647,7 +647,7 @@
647 647
648 GNU Emacs is free software; you can redistribute it and/or modify 648 GNU Emacs is free software; you can redistribute it and/or modify
649 it under the terms of the GNU General Public License as published by 649 it under the terms of the GNU General Public License as published by
650 the Free Software Foundation; either version 2, or (at your option) 650 the Free Software Foundation; either version 3, or (at your option)
651 any later version. 651 any later version.
652 652
653 GNU Emacs is distributed in the hope that it will be useful, 653 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/msdos/README b/msdos/README
index 11ff3975e0e..c8130364527 100644
--- a/msdos/README
+++ b/msdos/README
@@ -152,7 +152,7 @@ This file is part of GNU Emacs.
152 152
153GNU Emacs is free software; you can redistribute it and/or modify 153GNU Emacs is free software; you can redistribute it and/or modify
154it under the terms of the GNU General Public License as published by 154it under the terms of the GNU General Public License as published by
155the Free Software Foundation; either version 2, or (at your option) 155the Free Software Foundation; either version 3, or (at your option)
156any later version. 156any later version.
157 157
158GNU Emacs is distributed in the hope that it will be useful, 158GNU Emacs is distributed in the hope that it will be useful,
diff --git a/msdos/mainmake b/msdos/mainmake
index 569387f65d2..7553a3bb25d 100644
--- a/msdos/mainmake
+++ b/msdos/mainmake
@@ -5,7 +5,7 @@
5 5
6# GNU Emacs is free software; you can redistribute it and/or modify 6# GNU Emacs is free software; you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by 7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation; either version 2, or (at your option) 8# the Free Software Foundation; either version 3, or (at your option)
9# any later version. 9# any later version.
10 10
11# GNU Emacs is distributed in the hope that it will be useful, 11# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 14610ba79bb..12daa6ca91b 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -7,7 +7,7 @@
7 7
8# GNU Emacs is free software; you can redistribute it and/or modify 8# GNU Emacs is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License as published by 9# it under the terms of the GNU General Public License as published by
10# the Free Software Foundation; either version 2, or (at your option) 10# the Free Software Foundation; either version 3, or (at your option)
11# any later version. 11# any later version.
12 12
13# GNU Emacs is distributed in the hope that it will be useful, 13# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 56ca9da1bbe..7a0786a6414 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1393,7 +1393,7 @@
1393 1393
1394 GNU Emacs is free software; you can redistribute it and/or modify 1394 GNU Emacs is free software; you can redistribute it and/or modify
1395 it under the terms of the GNU General Public License as published by 1395 it under the terms of the GNU General Public License as published by
1396 the Free Software Foundation; either version 2, or (at your option) 1396 the Free Software Foundation; either version 3, or (at your option)
1397 any later version. 1397 any later version.
1398 1398
1399 GNU Emacs is distributed in the hope that it will be useful, 1399 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/INSTALL b/nt/INSTALL
index 489941e1578..a6fe79d826f 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -453,7 +453,7 @@ This file is part of GNU Emacs.
453 453
454GNU Emacs is free software; you can redistribute it and/or modify 454GNU Emacs is free software; you can redistribute it and/or modify
455it under the terms of the GNU General Public License as published by 455it under the terms of the GNU General Public License as published by
456the Free Software Foundation; either version 2, or (at your option) 456the Free Software Foundation; either version 3, or (at your option)
457any later version. 457any later version.
458 458
459GNU Emacs is distributed in the hope that it will be useful, 459GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/README b/nt/README
index 556db89b100..b452fedd1f5 100644
--- a/nt/README
+++ b/nt/README
@@ -74,7 +74,7 @@ This file is part of GNU Emacs.
74 74
75GNU Emacs is free software; you can redistribute it and/or modify 75GNU Emacs is free software; you can redistribute it and/or modify
76it under the terms of the GNU General Public License as published by 76it under the terms of the GNU General Public License as published by
77the Free Software Foundation; either version 2, or (at your option) 77the Free Software Foundation; either version 3, or (at your option)
78any later version. 78any later version.
79 79
80GNU Emacs is distributed in the hope that it will be useful, 80GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/addpm.c b/nt/addpm.c
index 32b4bd6b532..a2ad06149b2 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/addsection.c b/nt/addsection.c
index 055240ac715..c79bbbbadfd 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index d01e7f39724..3f3e639d8f7 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -17,7 +17,7 @@ This file is part of GNU Emacs.
17 17
18GNU Emacs is free software; you can redistribute it and/or modify 18GNU Emacs is free software; you can redistribute it and/or modify
19it under the terms of the GNU General Public License as published by 19it under the terms of the GNU General Public License as published by
20the Free Software Foundation; either version 2, or (at your option) 20the Free Software Foundation; either version 3, or (at your option)
21any later version. 21any later version.
22 22
23GNU Emacs is distributed in the hope that it will be useful, 23GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/config.nt b/nt/config.nt
index 4a0d6897b05..fb33f2797c7 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/configure.bat b/nt/configure.bat
index 2ff90186445..5ff084832dd 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -8,7 +8,7 @@ rem This file is part of GNU Emacs.
8 8
9rem GNU Emacs is free software; you can redistribute it and/or modify 9rem GNU Emacs is free software; you can redistribute it and/or modify
10rem it under the terms of the GNU General Public License as published by 10rem it under the terms of the GNU General Public License as published by
11rem the Free Software Foundation; either version 2, or (at your option) 11rem the Free Software Foundation; either version 3, or (at your option)
12rem any later version. 12rem any later version.
13 13
14rem GNU Emacs is distributed in the hope that it will be useful, 14rem GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index f2efdfd903b..01f00c83316 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/envadd.bat b/nt/envadd.bat
index 16e653d4a88..a2b7194c716 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -7,7 +7,7 @@ rem This file is part of GNU Emacs.
7rem 7rem
8rem GNU Emacs is free software; you can redistribute it and/or modify 8rem GNU Emacs is free software; you can redistribute it and/or modify
9rem it under the terms of the GNU General Public License as published by 9rem it under the terms of the GNU General Public License as published by
10rem the Free Software Foundation; either version 2, or (at your option) 10rem the Free Software Foundation; either version 3, or (at your option)
11rem any later version. 11rem any later version.
12rem 12rem
13rem GNU Emacs is distributed in the hope that it will be useful, 13rem GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/gmake.defs b/nt/gmake.defs
index c08ca32200f..51b4756995d 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -4,7 +4,7 @@
4# 4#
5# GNU Emacs is free software; you can redistribute it and/or modify 5# GNU Emacs is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by 6# it under the terms of the GNU General Public License as published by
7# the Free Software Foundation; either version 2, or (at your option) 7# the Free Software Foundation; either version 3, or (at your option)
8# any later version. 8# any later version.
9# 9#
10# GNU Emacs is distributed in the hope that it will be useful, 10# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/icons/README b/nt/icons/README
index a11ffba6ed3..4cb7d87f470 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -3,7 +3,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
3File: emacs.ico 3File: emacs.ico
4Author: Andrew Zhilin 4Author: Andrew Zhilin
5Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. 5Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
6License: GNU General Public License version 2 or later (see COPYING) 6License: GNU General Public License version 3 or later (see COPYING)
7 7
8 8
9Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico 9Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
@@ -13,7 +13,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
13Author: Rob Davenport <rgd at bigfoot.com> 13Author: Rob Davenport <rgd at bigfoot.com>
14Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 14Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
15 Free Software Foundation, Inc. 15 Free Software Foundation, Inc.
16License: GNU General Public License version 2 or later (see COPYING) 16License: GNU General Public License version 3 or later (see COPYING)
17 17
18 <http://users.adelphia.net/~rob.davenport/gnuicons.html> 18 <http://users.adelphia.net/~rob.davenport/gnuicons.html>
19 "These are some images of a 3D stylized gnu head that I created back 19 "These are some images of a 3D stylized gnu head that I created back
@@ -30,4 +30,4 @@ Tuomas Kuosmanen, Rodney Dawes, Jakub Steiner, Alexander Larsson, Tor
30Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca 30Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
31Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco 31Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
32Pesenti Gritti 32Pesenti Gritti
33License: GNU General Public License version 2 (see COPYING) 33License: GNU General Public License version 2
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index 1ccc4c4eb74..6cadc106d11 100755
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index b445ff0caa2..4961fba431d 100644
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h
index ce0e54bfcee..0b37e8584e7 100644
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 0923dd9246b..5050720a3f4 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 69d53b357ae..e7a10698ea2 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -8,7 +8,7 @@
8# 8#
9# GNU Emacs is free software; you can redistribute it and/or modify 9# GNU Emacs is free software; you can redistribute it and/or modify
10# it under the terms of the GNU General Public License as published by 10# it under the terms of the GNU General Public License as published by
11# the Free Software Foundation; either version 2, or (at your option) 11# the Free Software Foundation; either version 3, or (at your option)
12# any later version. 12# any later version.
13# 13#
14# GNU Emacs is distributed in the hope that it will be useful, 14# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index 2ee5879f11d..8266c903aaa 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -9,7 +9,7 @@ rem This file is part of GNU Emacs.
9rem 9rem
10rem GNU Emacs is free software; you can redistribute it and/or modify 10rem GNU Emacs is free software; you can redistribute it and/or modify
11rem it under the terms of the GNU General Public License as published by 11rem it under the terms of the GNU General Public License as published by
12rem the Free Software Foundation; either version 2, or (at your option) 12rem the Free Software Foundation; either version 3, or (at your option)
13rem any later version. 13rem any later version.
14rem 14rem
15rem GNU Emacs is distributed in the hope that it will be useful, 15rem GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 03ae2f851fa..2a69c0ed3a5 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -4,7 +4,7 @@
4# 4#
5# GNU Emacs is free software; you can redistribute it and/or modify 5# GNU Emacs is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by 6# it under the terms of the GNU General Public License as published by
7# the Free Software Foundation; either version 2, or (at your option) 7# the Free Software Foundation; either version 3, or (at your option)
8# any later version. 8# any later version.
9# 9#
10# GNU Emacs is distributed in the hope that it will be useful, 10# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/paths.h b/nt/paths.h
index d2077d90df4..9fb76cc78c4 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/preprep.c b/nt/preprep.c
index 7fedd9b8df2..4978c314861 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/nt/runemacs.c b/nt/runemacs.c
index 6b6b84e33be..643b8036827 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU Emacs is distributed in the hope that it will be useful,
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 95fe90f5e64..61fae662cdd 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -475,7 +475,7 @@
475 475
476 GNU Emacs is free software; you can redistribute it and/or modify 476 GNU Emacs is free software; you can redistribute it and/or modify
477 it under the terms of the GNU General Public License as published by 477 it under the terms of the GNU General Public License as published by
478 the Free Software Foundation; either version 2, or (at your option) 478 the Free Software Foundation; either version 3, or (at your option)
479 any later version. 479 any later version.
480 480
481 GNU Emacs is distributed in the hope that it will be useful, 481 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/oldXMenu/descrip.mms b/oldXMenu/descrip.mms
index 71ae9c203bf..c5d7a678fc3 100644
--- a/oldXMenu/descrip.mms
+++ b/oldXMenu/descrip.mms
@@ -7,7 +7,7 @@
7 7
8## This program is free software; you can redistribute it and/or modify 8## This program is free software; you can redistribute it and/or modify
9## it under the terms of the GNU General Public License as published by 9## it under the terms of the GNU General Public License as published by
10## the Free Software Foundation; either version 2, or (at your option) 10## the Free Software Foundation; either version 3, or (at your option)
11## any later version. 11## any later version.
12 12
13## This program is distributed in the hope that it will be useful, 13## This program 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
9 9
10GNU Emacs is free software; you can redistribute it and/or modify 10GNU Emacs is free software; you can redistribute it and/or modify
11it under the terms of the GNU General Public License as published by 11it under the terms of the GNU General Public License as published by
12the Free Software Foundation; either version 2, or (at your option) 12the Free Software Foundation; either version 3, or (at your option)
13any later version. 13any later version.
14 14
15GNU Emacs is distributed in the hope that it will be useful, 15GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 6a9f09ed0bd..d9fd342ef19 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
12 12
13GNU Emacs is free software; you can redistribute it and/or modify 13GNU Emacs is free software; you can redistribute it and/or modify
14it under the terms of the GNU General Public License as published by 14it under the terms of the GNU General Public License as published by
15the Free Software Foundation; either version 2, or (at your option) 15the Free Software Foundation; either version 3, or (at your option)
16any later version. 16any later version.
17 17
18GNU Emacs is distributed in the hope that it will be useful, 18GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
11 11
12GNU Emacs is free software; you can redistribute it and/or modify 12GNU Emacs is free software; you can redistribute it and/or modify
13it under the terms of the GNU General Public License as published by 13it under the terms of the GNU General Public License as published by
14the Free Software Foundation; either version 2, or (at your option) 14the Free Software Foundation; either version 3, or (at your option)
15any later version. 15any later version.
16 16
17GNU Emacs is distributed in the hope that it will be useful, 17GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
5 5
6GNU Emacs is free software; you can redistribute it and/or modify 6GNU Emacs is free software; you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by 7it under the terms of the GNU General Public License as published by
8the Free Software Foundation; either version 2, or (at your option) 8the Free Software Foundation; either version 3, or (at your option)
9any later version. 9any later version.
10 10
11GNU Emacs is distributed in the hope that it will be useful, 11GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU 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.
9 9
10GNU Emacs is free software; you can redistribute it and/or modify 10GNU Emacs is free software; you can redistribute it and/or modify
11it under the terms of the GNU General Public License as published by 11it under the terms of the GNU General Public License as published by
12the Free Software Foundation; either version 2, or (at your option) 12the Free Software Foundation; either version 3, or (at your option)
13any later version. 13any later version.
14 14
15GNU Emacs is distributed in the hope that it will be useful, 15GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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..6fd22fbb750 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
8 8
9GNU Emacs is free software; you can redistribute it and/or modify 9GNU Emacs is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2, or (at your option) 11the Free Software Foundation; either version 3, or (at your option)
12any later version. 12any later version.
13 13
14GNU Emacs is distributed in the hope that it will be useful, 14GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
7 7
8GNU Emacs is free software; you can redistribute it and/or modify 8GNU Emacs is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2, or (at your option) 10the Free Software Foundation; either version 3, or (at your option)
11any later version. 11any later version.
12 12
13GNU Emacs is distributed in the hope that it will be useful, 13GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU 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.
6 6
7GNU Emacs is free software; you can redistribute it and/or modify 7GNU Emacs is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License as published by 8it under the terms of the GNU General Public License as published by
9the Free Software Foundation; either version 2, or (at your option) 9the Free Software Foundation; either version 3, or (at your option)
10any later version. 10any later version.
11 11
12GNU Emacs is distributed in the hope that it will be useful, 12GNU Emacs is distributed in the hope that it will be useful,
diff --git a/vms/make-mms-derivative.el b/vms/make-mms-derivative.el
index 4d226374cfd..3f1c53778ec 100644
--- a/vms/make-mms-derivative.el
+++ b/vms/make-mms-derivative.el
@@ -9,7 +9,7 @@
9 9
10;; GNU Emacs is free software; you can redistribute it and/or modify 10;; GNU Emacs is free software; you can redistribute it and/or modify
11;; it under the terms of the GNU General Public License as published by 11;; it under the terms of the GNU General Public License as published by
12;; the Free Software Foundation; either version 2, or (at your option) 12;; the Free Software Foundation; either version 3, or (at your option)
13;; any later version. 13;; any later version.
14 14
15;; GNU Emacs is distributed in the hope that it will be useful, 15;; GNU Emacs is distributed in the hope that it will be useful,