# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1185340107 0
# Node ID f06998349cfc513fd3d2921be6ad68fbe2e906c9
# Parent  6aba169c4b1fa5f285398f39c9cad32c06a9fae3
Switch license to GPLv3 or later.

diff -r 6aba169c4b1f -r f06998349cfc src/s/aix3-1.h
--- a/src/s/aix3-1.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/aix3-1.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/aix3-2.h
--- a/src/s/aix3-2.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/aix3-2.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/aix4-1.h
--- a/src/s/aix4-1.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/aix4-1.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/bsd386.h
--- a/src/s/bsd386.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/bsd386.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/bsd4-1.h
--- a/src/s/bsd4-1.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/bsd4-1.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/bsd4-2.h
--- a/src/s/bsd4-2.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/bsd4-2.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/bsd4-3.h
--- a/src/s/bsd4-3.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/bsd4-3.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/cxux.h
--- a/src/s/cxux.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/cxux.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/cygwin.h
--- a/src/s/cygwin.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/cygwin.h	Wed Jul 25 05:08:27 2007 +0000
@@ -8,7 +8,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/darwin.h
--- a/src/s/darwin.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/darwin.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/dgux.h
--- a/src/s/dgux.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/dgux.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/dgux4.h
--- a/src/s/dgux4.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/dgux4.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/dgux5-4-3.h
--- a/src/s/dgux5-4-3.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/dgux5-4-3.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/dgux5-4r2.h
--- a/src/s/dgux5-4r2.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/dgux5-4r2.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/freebsd.h
--- a/src/s/freebsd.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/freebsd.h	Wed Jul 25 05:08:27 2007 +0000
@@ -8,7 +8,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/gnu-linux.h
--- a/src/s/gnu-linux.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/gnu-linux.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/gnu.h
--- a/src/s/gnu.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/gnu.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/hiuxmpp.h
--- a/src/s/hiuxmpp.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/hiuxmpp.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/hiuxwe2.h
--- a/src/s/hiuxwe2.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/hiuxwe2.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/hpux.h
--- a/src/s/hpux.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/hpux.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/hpux10.h
--- a/src/s/hpux10.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/hpux10.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/hpux8.h
--- a/src/s/hpux8.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/hpux8.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/hpux9.h
--- a/src/s/hpux9.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/hpux9.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/iris3-5.h
--- a/src/s/iris3-5.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/iris3-5.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/iris3-6.h
--- a/src/s/iris3-6.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/iris3-6.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/irix3-3.h
--- a/src/s/irix3-3.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/irix3-3.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/irix4-0.h
--- a/src/s/irix4-0.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/irix4-0.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/irix5-0.h
--- a/src/s/irix5-0.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/irix5-0.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/irix6-0.h
--- a/src/s/irix6-0.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/irix6-0.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/irix6-5.h
--- a/src/s/irix6-5.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/irix6-5.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/isc2-2.h
--- a/src/s/isc2-2.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/isc2-2.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/isc3-0.h
--- a/src/s/isc3-0.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/isc3-0.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/lynxos.h
--- a/src/s/lynxos.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/lynxos.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/ms-w32.h
--- a/src/s/ms-w32.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/ms-w32.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/msdos.h
--- a/src/s/msdos.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/msdos.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/netbsd.h
--- a/src/s/netbsd.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/netbsd.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/newsos5.h
--- a/src/s/newsos5.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/newsos5.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/nextstep.h
--- a/src/s/nextstep.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/nextstep.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/osf1.h
--- a/src/s/osf1.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/osf1.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/ptx.h
--- a/src/s/ptx.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/ptx.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/ptx4.h
--- a/src/s/ptx4.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/ptx4.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/riscix1-1.h
--- a/src/s/riscix1-1.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/riscix1-1.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/riscix12.h
--- a/src/s/riscix12.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/riscix12.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/rtu.h
--- a/src/s/rtu.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/rtu.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/sco4.h
--- a/src/s/sco4.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/sco4.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/sco5.h
--- a/src/s/sco5.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/sco5.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/sol2-3.h
--- a/src/s/sol2-3.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/sol2-3.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/sol2.h
--- a/src/s/sol2.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/sol2.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/sunos4-0.h
--- a/src/s/sunos4-0.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/sunos4-0.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/sunos4shr.h
--- a/src/s/sunos4shr.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/sunos4shr.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/template.h
--- a/src/s/template.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/template.h	Wed Jul 25 05:08:27 2007 +0000
@@ -8,7 +8,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/umax.h
--- a/src/s/umax.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/umax.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/unipl5-2.h
--- a/src/s/unipl5-2.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/unipl5-2.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/usg5-0.h
--- a/src/s/usg5-0.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/usg5-0.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/usg5-2-2.h
--- a/src/s/usg5-2-2.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/usg5-2-2.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/usg5-2.h
--- a/src/s/usg5-2.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/usg5-2.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/usg5-3.h
--- a/src/s/usg5-3.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/usg5-3.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/usg5-4-2.h
--- a/src/s/usg5-4-2.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/usg5-4-2.h	Wed Jul 25 05:08:27 2007 +0000
@@ -7,7 +7,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/usg5-4.h
--- a/src/s/usg5-4.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/usg5-4.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/vms.h
--- a/src/s/vms.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/vms.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff -r 6aba169c4b1f -r f06998349cfc src/s/xenix.h
--- a/src/s/xenix.h	Wed Jul 25 05:07:12 2007 +0000
+++ b/src/s/xenix.h	Wed Jul 25 05:08:27 2007 +0000
@@ -6,7 +6,7 @@
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,