Switch license to GPLv3 or later.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 0b316a83649bada7f2d38ea7085b48ce25bc7bdc..879143168e97dd9f0263827e3b39624a71154ad5 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -425,7 +425,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/admin/README b/admin/README
index 8efcfa3224a15b3a9b81ccb1f668ead313392aa6..2c07f40b52f31a52d8e4da7241de04535e2d3db5 100644 (file)
--- a/admin/README
+++ b/admin/README
@@ -71,7 +71,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/admin/admin.el b/admin/admin.el
index 342b40f9bdeb14a3e65eacb9c16f25363ccc2173..67b0c161f5beae3d48845bf0c99ff9b4991a6b01 100644 (file)
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -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 --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index c336d808d582521a2b7ec8bd42059e32919b43f0..22447643e5e8399d785d251fe42665aa7a151333 100644 (file)
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/admin/build-configs b/admin/build-configs
index b99b5405075f06269a8880d69edda39393e67ee3..f36a05ca70144f499579bf174e6838eff1fa4de9 100755 (executable)
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -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 --git a/admin/cus-test.el b/admin/cus-test.el
index cba8e31ac899bdf8037bdb6b408cedf2019c0f71..ac0c7b3790947e924c201f1610259388657cc82a 100644 (file)
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 03b5a00a12fc97f947521b904f77b95c66542c14..18d95451751f9297ccb120d2bff6e011f7909eed 100755 (executable)
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -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 --git a/admin/make-announcement b/admin/make-announcement
index 03a083e4c72bf8780e49e6f677ef63b36697d81f..1c7b4574fea48d80d5f027a3cd951712352eacb0 100755 (executable)
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -9,7 +9,7 @@
 
 ## GNU Emacs is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
+## the Free Software Foundation; either version 3, or (at your option)
 ## any later version.
 
 ## GNU Emacs is distributed in the hope that it will be useful,

diff --git a/admin/make-emacs b/admin/make-emacs
index d6b14ca22b9dbe73a153e6a7ef3b7f3bd941f2a8..23b4e1c637482915036277cead3c44bccba2a0be 100755 (executable)
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -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 --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index a6e70120e6dde6df4ccab543d606be8e4e7e8e0f..e451cfcb2aabddcfe71c6cc61a97c9dd33b198b2 100755 (executable)
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -10,7 +10,7 @@
 
 ## GNU Emacs is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
+## the Free Software Foundation; either version 3, or (at your option)
 ## any later version.
 
 ## GNU Emacs is distributed in the hope that it will be useful,

diff --git a/admin/revdiff b/admin/revdiff
index 78be1f6230402562f9ad89424cadc1d948c3d375..d9ea41782bac725d98cf4639bea39191b3ad7fb1 100755 (executable)
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -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 --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 61975aa6cb8aaf1c9e134666d57c973c86163289..0b1173059c52ad51ea45f0996a9b0873f71fcc7a 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -6233,7 +6233,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index bef8f1b9c29ba6bf9e3ce521d4dc7e34c08ebe32..1482ea6c5dfb7ac6b271548ab6033637907102ba 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -6,7 +6,7 @@
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index 39c5901348f556c082156d4fb35838a3d9965dc3..96f1643891f6661e18b69a9369facbd4153ecf16 100644 (file)
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -7,8 +7,8 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
 
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,9 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-# USA.
+# along with this program; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA.
 
 # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>.
 

diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index f82f877923e1beabe75fe44c0c0b792625b66c8a..d892d77dc5a134f2565a8fb5b66067d7810e3f8f 100644 (file)
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c
index 16d386f5b4ec084131ba4818799dcaa704f4e01a..08e5d8133616dc1b9abd06723862a05da92cd332 100644 (file)
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -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 --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index b1348f8e8410dbef5a62c4bd2c66f5374f85962c..ea230a9c3cdb27733bf05063efd4a9a85c5282c8 100644 (file)
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -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 --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index ea1e6cd7af89108235f0d7a3da91fc4ff2044507..9edba132134e16c900eba255e295148a7d01223c 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c
index f04a8b3f545a074d75a705050801d46dd0d1acde..7b39d2ed8fd70d716d8c3c4a3395ac0a03ba331b 100644 (file)
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 1d1f16ddf28ff29c9c6522cc4b55497bd9def6f7..6c61847546a724938fadce722d9d9c75aee113c9 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -36,8 +36,8 @@ This file is not considered part of GNU Emacs.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,8 +45,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
 
 
 /* NB To comply with the above BSD license, copyright information is

diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index e35c0f8a072130c754f99755cbe72f1fabc458ad..003f2da886c055ce92007b0037bf14c696d15917 100644 (file)
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index b6d6b881de7bdb623b4271f404b5cac83def72d4..587c2e0f618f37c4b39ada633ea3fd658b3fff8c 100644 (file)
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -9,7 +9,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c
index c2bec4f8e9a55ee9a40ade66ecb8192a22c3a93e..25f616250c1e936bb78ce569864999e419e615d3 100644 (file)
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/lib-src/getopt_.h b/lib-src/getopt_.h
index 377c48375487f7bd8011ec19e8fa02fdc0c7a6e0..7cccef3eeea24c5efd8b311795c8fad227b65eea 100644 (file)
--- a/lib-src/getopt_.h
+++ b/lib-src/getopt_.h
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/lib-src/getopt_int.h b/lib-src/getopt_int.h
index 25df3bbcfdcc26605067272ecd8842b07ec26272..049f47629006df90cb081c366bb48544a994c558 100644 (file)
--- a/lib-src/getopt_int.h
+++ b/lib-src/getopt_int.h
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/lib-src/gettext.h b/lib-src/gettext.h
index ed32900384340f2dbe3469c5a85eff180bff80f6..4a5941f86dc92068dcdc6b4b52d8bf0bc0153e93 100644 (file)
--- a/lib-src/gettext.h
+++ b/lib-src/gettext.h
@@ -4,7 +4,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index d2e9ecfd7eefb011e976ec17bd515574a1460e95..1dff1e3e6b7310a15f7460117685b35db41174c9 100755 (executable)
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -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 --git a/lib-src/hexl.c b/lib-src/hexl.c
index 7cabdc95a6640d13614c47688a60028de34793fc..98561cf604de789dba4a9e0006dd1d4609f6176b 100644 (file)
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -6,8 +6,8 @@ This file is not considered part of GNU Emacs.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index d76bdd527cf778283cc2d4034a11961886aee13c..3f3da3e700747b87a53a49986a8472e5b043c938 100644 (file)
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index b552160c759189d6b0e6c41fbb74019dc3836279..3076b85dbd8ad954c2ec3039812ff00910b2c45b 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -6,7 +6,7 @@
 #
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #
 #  GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 84d4f949b2faecfa7639deda144f5ddf3ddd61f1..aaaf91b1b1fc2c0046de34d09625e0afb227efc0 100644 (file)
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 5f6c12abcebf2cbc54440f9e3028e30fc664d389..e11733f96058bd57e1cac431aa0fb6c3a5bb88f4 100644 (file)
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index a5655519fe1be9082c1650ab0f4426df885141e4..267e8ba5a04f04d4cc16c1a112d70c72b2106d42 100644 (file)
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -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) any later
+   Free Software Foundation; either version 3, or (at your option) any later
    version.
 
    GNU Emacs is distributed in the hope that it will be useful, but WITHOUT

diff --git a/lib-src/pop.c b/lib-src/pop.c
index a829607faa5bfabf340a45c82aec8d7b3d866abc..9fcbe4b370cdc3c2744e24005c11785860ec7d05 100644 (file)
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/pop.h b/lib-src/pop.h
index 664fb26f7db974c0b895fa7710915ebcd3685908..85b666c652f542f75ba0b1e9d69c01f04afdbbb4 100644 (file)
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/profile.c b/lib-src/profile.c
index 1174666da7836196edb925c1414c8a07f359e97f..628b72ddcfe9ef5a8301cb241b178f4050fb6e11 100644 (file)
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index 1ec783934e69afb1fd9c9665e648c9dd1ea853fb..94396709e653b3a6a4927233dd3232c86cd763b8 100755 (executable)
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -9,7 +9,7 @@
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 371a52de66c5e386fc91696533cb16bbc630c524..c81f51d4d6095f71238f89d57879438c1fa765cf 100755 (executable)
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -59,7 +59,7 @@ Id='$Id$'
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,

diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index 28f736ab8439281d93daccfbf44d1e1924354439..e239eaab428d4c4951117b4eb859b6cdb625287d 100644 (file)
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -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 --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index cd504c8c5388b11ce51428dadc0f7e6423d3f583..4913f0946146821bd7e42bf950b00601abca4352 100644 (file)
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -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 --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 9f1c011ce79b53af3deee914bdad41d496ad0273..3ccfecdb7d7459f025a207e277a4e699391873e2 100644 (file)
--- 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.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 21c6e70e9d8db0ce2d94ea1d4da791da9142a3b1..4fd6fb47226e59c7f41a51861caf0933debdbd79 100755 (executable)
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -10,7 +10,7 @@
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog
index 2e08725df6991e9436bdc4b009e6121fa69d708d..a7c0c7fd5cd3cbed96e7e7a79560e3d965a7025e 100644 (file)
--- a/lispintro/ChangeLog
+++ b/lispintro/ChangeLog
@@ -246,7 +246,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/Makefile.in b/lispintro/Makefile.in
index 13ff68fbb16b195fa27600637cbed832da72e374..fc263c2095cc3d8339c8f6ade991e36c3a4720bf 100644 (file)
--- a/lispintro/Makefile.in
+++ b/lispintro/Makefile.in
@@ -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 --git a/lispintro/README b/lispintro/README
index df8cdc5241e2641a705b925369b66b7d55fdc031..5edd38af3eee940e30a5b7511f518c15ea4605ba 100644 (file)
--- a/lispintro/README
+++ b/lispintro/README
@@ -70,7 +70,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/cons-1.eps b/lispintro/cons-1.eps
index ea2c4168956f6c2672e59012cada7a7d5379f4f9..95a74dcf29832c9e9ee2610de93d1c4f90c38b03 100644 (file)
--- a/lispintro/cons-1.eps
+++ b/lispintro/cons-1.eps
@@ -14,7 +14,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/cons-2.eps b/lispintro/cons-2.eps
index b6fb796b452f4050f03913a878f843cc4f090801..b8537d28ea89da0e96bc8e6cd4c60df86d4993ee 100644 (file)
--- a/lispintro/cons-2.eps
+++ b/lispintro/cons-2.eps
@@ -14,7 +14,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/cons-3.eps b/lispintro/cons-3.eps
index ea3f8d4c80d91730b656a278ff2146a5c52fec7f..795fa2b18f4cabfbf1728dfbe1a79c30ccd81353 100644 (file)
--- a/lispintro/cons-3.eps
+++ b/lispintro/cons-3.eps
@@ -14,7 +14,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/cons-4.eps b/lispintro/cons-4.eps
index 80947b45a8e6f3f8f14fdcc58414690ae748ebaa..68b0a296c36524acd21620352ef5633e0cc0c768 100644 (file)
--- a/lispintro/cons-4.eps
+++ b/lispintro/cons-4.eps
@@ -14,7 +14,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/cons-5.eps b/lispintro/cons-5.eps
index a49bb062c16596b6059362548010dde7642472fe..e03815a4403a2ceddca0e3e314b2ec09efaeeff1 100644 (file)
--- a/lispintro/cons-5.eps
+++ b/lispintro/cons-5.eps
@@ -14,7 +14,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/drawers.eps b/lispintro/drawers.eps
index b0f2f64e0a9b346b7f1a8b7c481c6021e5c19d60..0e5a222ae45af2b696cbca75122b7e2dbb28c520 100644 (file)
--- a/lispintro/drawers.eps
+++ b/lispintro/drawers.eps
@@ -16,7 +16,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/lambda-1.eps b/lispintro/lambda-1.eps
index 14780fefe76b84cb9cfd853e8e90ed2693e1d8e7..5b1b5d042995fcc3b442bae122c40d0e38911d1f 100644 (file)
--- a/lispintro/lambda-1.eps
+++ b/lispintro/lambda-1.eps
@@ -14,7 +14,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/lambda-2.eps b/lispintro/lambda-2.eps
index 5d2717342ac7f716c1014f5cff1b455386530b98..6288283abce1614b7aa3804251af3846530104ea 100644 (file)
--- a/lispintro/lambda-2.eps
+++ b/lispintro/lambda-2.eps
@@ -14,7 +14,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/lambda-3.eps b/lispintro/lambda-3.eps
index 4f16e9d9185f679d76e76f04244121574d6e862f..26f7d5d9644af2ef1b8c4f2bce60ad190d893dbe 100644 (file)
--- a/lispintro/lambda-3.eps
+++ b/lispintro/lambda-3.eps
@@ -14,7 +14,7 @@
 %
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in
index 579d93481b61986657c4a34df725701bb64060f1..07d51d2462010734a39a9379fdd1bf15fd39d799 100644 (file)
--- a/lispintro/makefile.w32-in
+++ b/lispintro/makefile.w32-in
@@ -6,7 +6,7 @@
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 61ee06011e64b515f03a52c2e70f2d983442cdb5..41c71a6ae08fa113b31b3c68f81f464a3d54b49d 100644 (file)
--- 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)
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index 9abd45f8f1564e6bd9534913ce0b61059cc91604..1a34d60a0d876bbbe23c863ee410bd31cf37b4fe 100644 (file)
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -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 --git a/lispref/README b/lispref/README
index 564c349256edb193d27d9b63463ac3b3017a2b98..c5d4c8acc7772d41e05aef13073357cc7bcbfa1b 100644 (file)
--- a/lispref/README
+++ b/lispref/README
@@ -58,7 +58,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
index dc312691dabff6b56666dcd55374a8282a49d37a..7e35339d17f5c7c5f03a9398901bbcdcfca09571 100644 (file)
--- a/lispref/makefile.w32-in
+++ b/lispref/makefile.w32-in
@@ -6,7 +6,7 @@
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lispref/two-volume-cross-refs.txt b/lispref/two-volume-cross-refs.txt
index 1e923cab8e6908f245ad37ba3f5f8395f38b9a9e..6e40920cf665a744a2da8d4d510b9fbc61b80046 100644 (file)
--- a/lispref/two-volume-cross-refs.txt
+++ b/lispref/two-volume-cross-refs.txt
@@ -308,7 +308,7 @@ COPYING CONDITIONS
 
 This file is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 This file is distributed in the hope that it will be useful,

diff --git a/lispref/two-volume.make b/lispref/two-volume.make
index 5b531ab87a5fffc091a566f7160639077611510a..b2550576825640a5a51cd9e895898010cf7535ed 100644 (file)
--- a/lispref/two-volume.make
+++ b/lispref/two-volume.make
@@ -211,7 +211,7 @@ elisp2-init: vol2.texi
 # 
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # This file is distributed in the hope that it will be useful,

diff --git a/lispref/two.el b/lispref/two.el
index 5f8fca8c54b5da22043f4f2fcb03ddb491a6fd2f..baade844463bdadf1dfad2fc50cfb2118cd42b4b 100644 (file)
--- a/lispref/two.el
+++ b/lispref/two.el
@@ -7,7 +7,7 @@
 
 ;; This file is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; This file is distributed in the hope that it will be useful,

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index f6764e87e17c68249d9a6bcd68cbd3eede3f27ba..5059fe32b3762c85361e85c2cb6988355ee844df 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1350,7 +1350,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 5eb769f3a74a3b4bad4dfd0c42520742aafaa39a..87edc913b057f3bd2caa43ea5ec5b41b00b762f0 100644 (file)
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -905,7 +905,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist
index c27500678b8d12413ca677dd2ab62ba5b951feed..ed2c4a8bf7c6e868fbe023b916a1187b4d1a5411 100644 (file)
--- 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.
 
 GNU Emacs is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
+Free Software Foundation; either version 3, or (at your option) any
 later version.
 
 GNU Emacs is distributed in the hope that it will be useful, but

diff --git a/mac/INSTALL b/mac/INSTALL
index 302317b025f33b4a03fc21d4074de9d4754e1c84..7cdf0de494008f65b00505d11e29dbb2cb58f5e0 100644 (file)
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -220,7 +220,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/README b/mac/README
index 1d8cc40e545a41037a01517f16abd8c036b3aa50..f02527d63831e67f3e8203617295df711814b920 100644 (file)
--- a/mac/README
+++ b/mac/README
@@ -49,7 +49,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/cw6-mcp.xml b/mac/cw6-mcp.xml
index 38f12ba2e74d47460f05e8346a64b8fe5b4a0ce7..410f512e37a68db79937ec92557ab65949d759c5 100644 (file)
--- a/mac/cw6-mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
+Free Software Foundation; either version 3, or (at your option) any
 later version.
 
 GNU Emacs is distributed in the hope that it will be useful, but

diff --git a/mac/inc/alloca.h b/mac/inc/alloca.h
index 9ce323d0f77db212d8f61fbd1fcad9801978b3f2..f0c47e1f7badcc41b49d23424bf25bead9bdf0dd 100644 (file)
--- a/mac/inc/alloca.h
+++ b/mac/inc/alloca.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
+Free Software Foundation; either version 3, or (at your option) any
 later version.
 
 GNU Emacs is distributed in the hope that it will be useful, but

diff --git a/mac/inc/config.h b/mac/inc/config.h
index b9fb9a6d8cf266bb4328e4df7161f13188fa2bf0..ae741b0681f70aac99304e2d697c52eaee146488 100644 (file)
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/defs-cw6.h b/mac/inc/defs-cw6.h
index e72cd9e5f73b33424ea3c376203722db2bb8935b..05dfa901a2485d82019e9668727da4064b87fca3 100644 (file)
--- a/mac/inc/defs-cw6.h
+++ b/mac/inc/defs-cw6.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
+Free Software Foundation; either version 3, or (at your option) any
 later version.
 
 GNU Emacs is distributed in the hope that it will be useful, but

diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h
index 40ec3467081e4d65ff230fa03e78681e874b726c..0efaf879466fb5600d620c64a85c73c477352d04 100644 (file)
--- a/mac/inc/dirent.h
+++ b/mac/inc/dirent.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h
index 2c29f98f5c809bdfcb9ddad00b728da229410a52..e9ee0a9fb7055c4969736d9bff0e13432a8b14ea 100644 (file)
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/grp.h b/mac/inc/grp.h
index b4311f5ee1ccd9c8af4113df6531499fb8e6d007..f8e93b5d2c1fc7222818520cf39ef89f3a05d6b1 100755 (executable)
--- a/mac/inc/grp.h
+++ b/mac/inc/grp.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h
index 544e5d0187dfd42f1bd76a142b4e4b9bf5d8a6d1..a5a26cd000c0ef6305bc06663c5a5b57c9899ac9 100644 (file)
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/pwd.h b/mac/inc/pwd.h
index 239b915430b943b4840c48b74fcd2ca56cf133b0..c992b5c4ea98eda5e8100433303bb21868812286 100644 (file)
--- a/mac/inc/pwd.h
+++ b/mac/inc/pwd.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/s-mac.h b/mac/inc/s-mac.h
index 83715a7ea064f8684770887cd3af1cc5ebb4ea2b..4798fb9c3bda235fdcbefb60a89cdb53fbcc129f 100644 (file)
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/sys/file.h b/mac/inc/sys/file.h
index 4b320eaea2fdcb07d3a42c22c95d2c954bb2787f..e720fc1c0ce7a652daac697d8c6a911342afefbc 100644 (file)
--- a/mac/inc/sys/file.h
+++ b/mac/inc/sys/file.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h
index e2fca68f0213e1a646403a0788638194b5eb7a45..d0caa4b0eb7e4dd777869a65e12ef14f611c14b0 100644 (file)
--- a/mac/inc/sys/ioctl.h
+++ b/mac/inc/sys/ioctl.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/sys/param.h b/mac/inc/sys/param.h
index b4f93fa924e1b78514f26f849337b2922da64f47..265f5384c9cf1e0a9350764876e56787c5183488 100644 (file)
--- a/mac/inc/sys/param.h
+++ b/mac/inc/sys/param.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/sys/stat.h b/mac/inc/sys/stat.h
index 4a9cd5fcdc1dddd02b6136b15c6cc59ec6c75146..0e352211e1634fc9e7f7764aaaff906c31fca1de 100644 (file)
--- a/mac/inc/sys/stat.h
+++ b/mac/inc/sys/stat.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/sys/time.h b/mac/inc/sys/time.h
index 14579bea4e4f156d5275e305756d65934564310c..057ecca42bec2d609a83d9de52ab3dc654ae743b 100644 (file)
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/sys/types.h b/mac/inc/sys/types.h
index 27c85643124da4bd0ed63bc94e08812c16304215..bec6e4c773b6e114672fa3b4a80a0951fa580fd6 100644 (file)
--- a/mac/inc/sys/types.h
+++ b/mac/inc/sys/types.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/termio.h b/mac/inc/termio.h
index 26f4d0a975a2f0c2a435f56ca0d67b873ee0336e..34e034c2fd16d4de3b0fa7dcb5d34ed69c9273f0 100644 (file)
--- a/mac/inc/termio.h
+++ b/mac/inc/termio.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/utime.h b/mac/inc/utime.h
index 66fb3cf3afd0a0ed6fd45200dce855972acdac4a..2deefbb96170655ac87b962d5772051812653e17 100644 (file)
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/inc/utsname.h b/mac/inc/utsname.h
index e34e2ebbd1bda1a6c50c310eec45afac56dd4dd1..174d9cffe852bafb4efd7bdbb3b6fc9f0032e905 100644 (file)
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/make-package b/mac/make-package
index 1db34d2046c9211cc8098b3dffd03f4340b3779c..2d10710da80714d36ca647e05c6baed6904419b3 100755 (executable)
--- a/mac/make-package
+++ b/mac/make-package
@@ -24,7 +24,7 @@
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index cbfbff76b72075634f3a376535175ac33b9b1cf7..9c03942effaa8819b10cc321904f73e468c8ff57 100644 (file)
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -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 --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 27d91b59ea087056bfad4cd14ff1979506232460..21204ea22bb11a3430f5033558adc52ebcd7fea8 100644 (file)
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r
index 4d6faa25a84863f53be165b72cb19687923e18d6..f017f2bec78d6aef2aec183c05bbe01659862162 100644 (file)
--- a/mac/src/EmacsMPW.r
+++ b/mac/src/EmacsMPW.r
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/mac/src/chdir.c b/mac/src/chdir.c
index e1b112c7bf4f1ee6b1ceed22473d5ada26809080..eb0670f3fd5daa1eed5c210d4b69a490f0984bd0 100644 (file)
--- a/mac/src/chdir.c
+++ b/mac/src/chdir.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/man/ChangeLog b/man/ChangeLog
index 6b3b8d251e950296c0ce3f748e9328cbb413ec25..b36abb666cd43358b0d31f91f0f17b32405b60ab 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -7985,7 +7985,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/man/Makefile.in b/man/Makefile.in
index 94ace1265376421c889942450167fdbb9414bf3e..f52ac990b7c938730cb06f1bb0e9983ff1262ae6 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -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 --git a/man/makefile.w32-in b/man/makefile.w32-in
index 2e559a629067430b057a5f9be6afb499a3c73e0a..7e3723c1949ccec2fab093b0b32e0672eabd1d5b 100644 (file)
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -6,7 +6,7 @@
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/man/mh-e.texi b/man/mh-e.texi
index 76697cbdcf5a4ff645764dc060fe29df6c395f4c..6832eb1e05c7355ef161e36daf9ab9d5c9c6902b 100644 (file)
--- a/man/mh-e.texi
+++ b/man/mh-e.texi
@@ -39,7 +39,7 @@ no Front-Cover Texts, and no Back-Cover Texts.
 
 @item
 the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.
+Foundation; either version 3, or (at your option) any later version.
 @end enumerate
 
 The MH-E manual is distributed in the hope that it will be useful, but

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 4c7c136c1875affca315387d2442f8fe962c9a6a..6ce19812eacb48476759b0cd542a2cedc695646e 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -647,7 +647,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/msdos/README b/msdos/README
index 11ff3975e0e78b3a69e42217be2cb4b7615b393e..c813036452794366bbd5caae0b1c182797178fb7 100644 (file)
--- a/msdos/README
+++ b/msdos/README
@@ -152,7 +152,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/msdos/mainmake b/msdos/mainmake
index 569387f65d2eb5038e547a5bd3186a4f0f259d90..7553a3bb25dee989a14efcefbdf327ada2bf11c5 100644 (file)
--- a/msdos/mainmake
+++ b/msdos/mainmake
@@ -5,7 +5,7 @@
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,

diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 14610ba79bb57b66f02984e707aa080bd5a8fd0a..12daa6ca91b8c6ef011999f8fc1a90dfece8b324 100644 (file)
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -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 --git a/nt/ChangeLog b/nt/ChangeLog
index 56ca9da1bbe29660efc67858d0167d2f35859fd0..7a0786a64140cd8fd42626ae8ecadb1c8a77a5bc 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1393,7 +1393,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/INSTALL b/nt/INSTALL
index 489941e1578b2c1dbacd64acccb66251d9885434..a6fe79d826fed9549287a5310199027c28ba0d29 100644 (file)
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -453,7 +453,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/README b/nt/README
index 556db89b10096d447505918beb313e72df3b63aa..b452fedd1f506c255601222683093b66e552b406 100644 (file)
--- a/nt/README
+++ b/nt/README
@@ -74,7 +74,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/addpm.c b/nt/addpm.c
index 32b4bd6b53269624575992f89af5471363a7a660..a2ad06149b24e0abfe165d573900a9bc94afce7d 100644 (file)
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/addsection.c b/nt/addsection.c
index 055240ac715324df0489e60fc7cf371ee9497cd5..c79bbbbadfdf8153e7dab98c36390c021f2bd809 100644 (file)
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index d01e7f3972436dafc8dcd22d0f015f78a74c040f..3f3e639d8f7dfa329e09c69179fb073f05323c35 100644 (file)
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -17,7 +17,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/config.nt b/nt/config.nt
index 4a0d6897b05a96f12f8ef3351509ad11c9232fdd..fb33f2797c7310eb98611c6aa6b183da6caf6b92 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/configure.bat b/nt/configure.bat
index 2ff901864455a99bb06846c93e2bbff759c64ca7..5ff084832dda3569ac3f80957813acc3fd86f94c 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -8,7 +8,7 @@ rem   This file is part of GNU Emacs.
 \r
 rem   GNU Emacs is free software; you can redistribute it and/or modify\r
 rem   it under the terms of the GNU General Public License as published by\r
-rem   the Free Software Foundation; either version 2, or (at your option)\r
+rem   the Free Software Foundation; either version 3, or (at your option)\r
 rem   any later version.\r
 \r
 rem   GNU Emacs is distributed in the hope that it will be useful,\r

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index f2efdfd903b92b553576a060b1b8a1f7ded35456..01f00c83316d6aeca109c0cb0104812b22b3b0be 100644 (file)
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/envadd.bat b/nt/envadd.bat
index 16e653d4a887dac479d63157df1574d051c52326..a2b7194c71629a75090a3d454f77cd15b8f028d2 100644 (file)
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -7,7 +7,7 @@ rem  This file is part of GNU Emacs.
 rem\r
 rem  GNU Emacs is free software; you can redistribute it and/or modify\r
 rem  it under the terms of the GNU General Public License as published by\r
-rem  the Free Software Foundation; either version 2, or (at your option)\r
+rem  the Free Software Foundation; either version 3, or (at your option)\r
 rem  any later version.\r
 rem\r
 rem  GNU Emacs is distributed in the hope that it will be useful,\r

diff --git a/nt/gmake.defs b/nt/gmake.defs
index c08ca32200fe071a6be93e792a503381b4d63b04..51b4756995d0014950134a14f9e8bf778f38ac86 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -4,7 +4,7 @@
 #
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #
 #  GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/icons/README b/nt/icons/README
index a11ffba6ed30c921a0246f5e661298c49e0b79ee..4cb7d87f4706faf3c55f398caaacbd99599df40c 100644 (file)
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -3,7 +3,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 File: emacs.ico
 Author: Andrew Zhilin
 Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
 
 Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
@@ -13,7 +13,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
 Author: Rob Davenport <rgd at bigfoot.com>
 Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+License: GNU General Public License version 3 or later (see COPYING)
 
   <http://users.adelphia.net/~rob.davenport/gnuicons.html>
   "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
 Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
 Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
 Pesenti Gritti
-License: GNU General Public License version 2 (see COPYING)
+License: GNU General Public License version 2

diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index 1ccc4c4eb74330c75169ff5722d73ff0da1fa9ec..6cadc106d11c439b98ba587f397fd97a9748174d 100755 (executable)
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index b445ff0caa2cb03664ee52473f3a07bcba45eb64..4961fba431d499f8e85fbf9f8ab2742a55c72a2f 100644 (file)
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h
index ce0e54bfceeb4f2796750b3e178f8dd36e961483..0b37e8584e78cbec78bfc174f2ddd5d64ab5395d 100644 (file)
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 0923dd9246bc0dd9f1c4b3bcd39c503de69863c3..5050720a3f4e5e5ea998d8c970f114ca744bf0bb 100644 (file)
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 69d53b357ae41c515a688d1658075c515abf713c..e7a10698ea28e5a3beb21b9ea41b907651386ce0 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -8,7 +8,7 @@
 #\r
 #  GNU Emacs is free software; you can redistribute it and/or modify\r
 #  it under the terms of the GNU General Public License as published by\r
-#  the Free Software Foundation; either version 2, or (at your option)\r
+#  the Free Software Foundation; either version 3, or (at your option)\r
 #  any later version.\r
 #\r
 #  GNU Emacs is distributed in the hope that it will be useful,\r

diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index 2ee5879f11d66a849b5229afa84637a1d8e2885b..8266c903aaa36aedb88717ad59b0084dc1915fc6 100644 (file)
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -9,7 +9,7 @@ rem  This file is part of GNU Emacs.
 rem\r
 rem  GNU Emacs is free software; you can redistribute it and/or modify\r
 rem  it under the terms of the GNU General Public License as published by\r
-rem  the Free Software Foundation; either version 2, or (at your option)\r
+rem  the Free Software Foundation; either version 3, or (at your option)\r
 rem  any later version.\r
 rem\r
 rem  GNU Emacs is distributed in the hope that it will be useful,\r

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 03ae2f851fa75944669f29782694a899bf74679c..2a69c0ed3a502025ee7b3dae02464f03b43286e3 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -4,7 +4,7 @@
 #\r
 #  GNU Emacs is free software; you can redistribute it and/or modify\r
 #  it under the terms of the GNU General Public License as published by\r
-#  the Free Software Foundation; either version 2, or (at your option)\r
+#  the Free Software Foundation; either version 3, or (at your option)\r
 #  any later version.\r
 #\r
 #  GNU Emacs is distributed in the hope that it will be useful,\r

diff --git a/nt/paths.h b/nt/paths.h
index d2077d90df4b24046ea2760e695eb0dce1364a8c..9fb76cc78c4e8980fcf6868decdcabf9c648fe1f 100644 (file)
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/preprep.c b/nt/preprep.c
index 7fedd9b8df2cc7eaf693f855ecf9ae889372d671..4978c314861f53b5996f11906a8dc09f19a4756e 100644 (file)
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/nt/runemacs.c b/nt/runemacs.c
index 6b6b84e33be0902dbba3e4c5fcb4930e2240fd0f..643b8036827caffea15c704a6e3f88d165814abe 100644 (file)
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 95fe90f5e6478a7ba1fcdbb0c6da8306f5484565..61fae662cdde667c11b227dba61682cdf60cd7b9 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -475,7 +475,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,

diff --git a/oldXMenu/descrip.mms b/oldXMenu/descrip.mms
index 71ae9c203bfaad7dcda4b250053564cc5a4d4e10..c5d7a678fc3f9ce062bf1978066765d12e6a1ae0 100644 (file)
--- a/oldXMenu/descrip.mms
+++ b/oldXMenu/descrip.mms
@@ -7,7 +7,7 @@
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
+## the Free Software Foundation; either version 3, or (at your option)
 ## any later version.
 
 ## This program is distributed in the hope that it will be useful,

diff --git a/src/m/7300.h b/src/m/7300.h
index 1022e07704640e932953dfc764d5bde2d11afd09..b590593abc87ac738d0b494644d12901f27ebc26 100644 (file)
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/acorn.h b/src/m/acorn.h
index dee60071e12a720afcd3878834ff6cb7fc1f247b..7fa5991e28b1d92ba3a766d2f8f2e62f031d85de 100644 (file)
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
index e81fe48b9e7dd652f200afb1c290c78ae50d2d2a..3d65f9d1f121fb289490afd3a4a1f44c6a4e5252 100644 (file)
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/alliant.h b/src/m/alliant.h
index 5ddab96012f2b1e8465bdfb2b61548c8fa22ef7b..b871d4a238547f339b08507fccb4fee387596143 100644 (file)
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -9,7 +9,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/alpha.h b/src/m/alpha.h
index 6a9f09ed0bdc57722d6245f011154e2c33036c88..d9fd342ef19fdcfa5c891f93e0076d9be40cab41 100644 (file)
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/altos.h b/src/m/altos.h
index 1a7c6d4f95a9fae6b3f5f0f842c0a3720a69b1aa..8a1cb138345cd3af1247667be76d4d5ca2701acb 100644 (file)
--- a/src/m/altos.h
+++ b/src/m/altos.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index c5cae1fc5608e9e53ab2ac45321f433dbf4fa6a2..3d9ee17e91f9fe4d57af49a9777bf27f2d986d89 100644 (file)
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 0dcf55246455e3b1af746d95fa31106490f0fd85..fbd53a955a204011e083443db61e4a51744ac7e1 100644 (file)
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/apollo.h b/src/m/apollo.h
index 0e6e53327bccbedfde0f9f0975d0c78b8ee68a76..b769c24c2949614a9e8bd2a603922d2d82370055 100644 (file)
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/arm.h b/src/m/arm.h
index 18675f2805ce521bfbe0aff03b5b9dad18d7ac15..b1df83f9b705e1a9fce26d1cc46d8b53a6e22aa5 100644 (file)
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/att3b.h b/src/m/att3b.h
index 33411ff005cb6c419395194a34b0dedc3c467dc6..3344aabc2a95a4e2bb4a795c1fe6eaf0dcbde13e 100644 (file)
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/aviion.h b/src/m/aviion.h
index 87b7d963f5a41827b0384149130814f11c843ac7..7f3f7f253d582367333a45737fa644e96e93bdf9 100644 (file)
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/celerity.h b/src/m/celerity.h
index 0eba349b7db65f9f8e372bd25a796f601249aab2..76f1e1729b307baf1e6969213f8217b127460ac2 100644 (file)
--- a/src/m/celerity.h
+++ b/src/m/celerity.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/clipper.h b/src/m/clipper.h
index 6851761d53ee9ac41e5ce0e03e7b4c567e225055..de99ba97eb5149fa089f48021c0c1768ef3658d9 100644 (file)
--- a/src/m/clipper.h
+++ b/src/m/clipper.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index 09e3365bee95fa0bae6baff0383fd704e5793f79..f64fc86b08b11531eb17ccd87fe7b9407fc48c59 100644 (file)
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/convex.h b/src/m/convex.h
index 2904b5942f4c440c2dd25677143929fe485a75ca..7f90d22117c6b135ca85e3f8d7d30d2e013023d5 100644 (file)
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index 75aca4b0e645d3211200131ff6b98dcaefc6f457..2361fb4b589bdeb59b4c9bdcd9d0ab9bd187df18 100644 (file)
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 7017e38284efabfc3b91d191268775d6f0ea31b7..c767e1db1cab3a4e3dc5f6a999167a73ad5ee63a 100644 (file)
--- a/src/m/delta88k.h
+++ b/src/m/delta88k.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index de0b93b21ac97154fad1ce08d581072952dda97d..1c1d146a08abe6f06836051a23898e4cee7df3be 100644 (file)
--- a/src/m/dpx2.h
+++ b/src/m/dpx2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/dual.h b/src/m/dual.h
index 63829b75d2ed03bbbad76504f6877ebaf66909e8..4fda7a8a96cf366b0c58422855d72cb7033ddf10 100644 (file)
--- a/src/m/dual.h
+++ b/src/m/dual.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index c264d57338b81b583c9f9bfa024b4a12c86f2e0b..81689e66e526f312adde80804377183f635364ad 100644 (file)
--- a/src/m/elxsi.h
+++ b/src/m/elxsi.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ews4800.h b/src/m/ews4800.h
index 528ce95d685a7f328d6c62dde42acc75e6e4d45b..35bfb59f1524353673e6f0d0e68f614ed6bc8ca0 100644 (file)
--- a/src/m/ews4800.h
+++ b/src/m/ews4800.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h
index a750c9f8f3935b2014b1b7fffa4fe4e8e579ad6a..cb3da1825cc9f4bbbef48fb9d0d6663c4d46bd72 100644 (file)
--- a/src/m/gould-np1.h
+++ b/src/m/gould-np1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/gould.h b/src/m/gould.h
index 0b422f18fe2aa2afc171f880e6ab339abed7aeaa..c31f50249e70b1daca689a9881b18486bb4e1beb 100644 (file)
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -12,7 +12,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/hp800.h b/src/m/hp800.h
index f48f4c8152eb6f93a454dbad19bb983952c28409..d54690104b5a6b9643ecc6e6c360860ae55eecc1 100644 (file)
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index c02a68d31cc87da26e0cec3fa78fd8a21a8a3c0a..3718bb3f3ae0d811bde4b975d45c5077d25b33df 100644 (file)
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/i860.h b/src/m/i860.h
index 6af68cc2ae78f6e8b95294d759dd950fbd53b60f..1255f2f1576bc2943b5719094e7030f15670f574 100644 (file)
--- a/src/m/i860.h
+++ b/src/m/i860.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ia64.h b/src/m/ia64.h
index 7e88aeaedc8c98515301a718ac3f4fe8e8ca402b..b6fea6b8fd73450dca6fe59306694e1d97fa4a36 100644 (file)
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h
index 09460092b3ecf049a2ad5a78815f50661f8df4c4..f632a30780bfa7d79c022020bbf5494e8ea8fbb5 100644 (file)
--- a/src/m/ibm370aix.h
+++ b/src/m/ibm370aix.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index c8449baef4186b6f5cb93415bae607b2622d8e23..8882052b0068c7acc560a449fd285898ce840b57 100644 (file)
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 6729282953e879df84cc1c6361fabf88e2403cc5..2a298e7f760692189f9127e35d511ebcaa4f4370 100644 (file)
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index ccee40a46a9034c65bc7d827b0f520e3157df124..d24e99fe6d62bbf3791534ab36aad33c5c75c6ad 100644 (file)
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index 2cf372a278dab173a74db17d5ea7f8f60264c9c0..55cbfd8837117fda9ebfa729197901e03d2559f2 100644 (file)
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index e038e2e1b52c1ac2586da1c3af6ab7de458a371f..aece0f7599e1acfe5fd2b10189b3a6daa3a2ca32 100644 (file)
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index f8b21bc3df4c1213cf27de18fbb79f42a8324921..fb1f210c6345a4c530d1a3714f710cf766be69cd 100644 (file)
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/intel386.h b/src/m/intel386.h
index 44ba3245b2e8a40748b6897b78cc534d3dbd2c42..7c6c2106d17f3dca8bfd6b3c0f4af890f90e1127 100644 (file)
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 4304871ca2301a1eaeb0ce1e03e124c8f1d90848..d918c25aedef2b4f4dd0d0bc73e3d46cfe73e2b0 100644 (file)
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/irist.h b/src/m/irist.h
index 4ae3681bd920e2df70b07760ab207fae30834a50..0b33bd964aa866cc648fbb72070a4044ad8a0edb 100644 (file)
--- a/src/m/irist.h
+++ b/src/m/irist.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
index ed96605b5a19663432f69ab68c58cf6bf864e1b8..7e25ed9d277d4b441622a15ea0e4d677c5e75ec1 100644 (file)
--- a/src/m/isi-ov.h
+++ b/src/m/isi-ov.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/m68k.h b/src/m/m68k.h
index 1071847eda9285e7433ab6e847ada64e533cce65..c771e8637113ea297495a54775d095776e9e4b9b 100644 (file)
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/macppc.h b/src/m/macppc.h
index 26994575edd89caa17f9718c73d55bb2341cce33..cc4afe31519c40ac4d4a3287ccae0cfdde2a77e5 100644 (file)
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index 777ff7977272acb9990017745e97bc742c0149f9..ac753de1537b3de8503b56ca481216f4d2a11a16 100644 (file)
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/mega68.h b/src/m/mega68.h
index 54340bdb0be6d110f957912aa4ca05a4f3a7f7a9..6d991ba06a2c5f5ca7bf6c4f0b9f9ce9050f43db 100644 (file)
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/mg1.h b/src/m/mg1.h
index b0d6faca50024029acd6054745ff95136dba8e12..647544e21e470cf27b4324a5dd9900a57583a4da 100644 (file)
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
index 376f880578804ac313869f2f51b7baf0f9fb83b6..d90a651d361c4e160de2267ac2d152d31584a8df 100644 (file)
--- a/src/m/mips-siemens.h
+++ b/src/m/mips-siemens.h
@@ -11,7 +11,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/mips.h b/src/m/mips.h
index ee8e63030c738deb79f69f4d9de8f5fa90d62b17..b18324fb8b7c4406a7cd60da9fef830cc32f4e12 100644 (file)
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/mips4.h b/src/m/mips4.h
index f9517d6b560c35bc039deca15d86c4f0b88e987a..a55e4c5e31361f91e8f477639070c2b4a232cf16 100644 (file)
--- a/src/m/mips4.h
+++ b/src/m/mips4.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/news-risc.h b/src/m/news-risc.h
index 0a2564553f76152b4b29de5c8f622dec5264cfd7..b7ea3dbceff5023da8c8e6a29fc9e4d85a116103 100644 (file)
--- a/src/m/news-risc.h
+++ b/src/m/news-risc.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/news.h b/src/m/news.h
index 13a718a861287072d6fd1441673fe23ecf8d9d74..419015dd150a40f3b289318b556044ecc4bb3b5e 100644 (file)
--- a/src/m/news.h
+++ b/src/m/news.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/next.h b/src/m/next.h
index 2a0f72437724a5e6f19c8abdc93a33ba323438d0..ef92607d957fd424e3b0ea3b62523edc39939c3f 100644 (file)
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/nh3000.h b/src/m/nh3000.h
index e5cf1a61b58de06aa4f8a34a2efefd62ded7f7b2..e4a9817d57c589e755aeb75967403e0c1523a832 100644 (file)
--- a/src/m/nh3000.h
+++ b/src/m/nh3000.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/nh4000.h b/src/m/nh4000.h
index ba695700d770ac7bd85dda9d2a015416dbe9324d..20fadb71e435047c930dc3fc700992121a247c4c 100644 (file)
--- a/src/m/nh4000.h
+++ b/src/m/nh4000.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index 707cb21abb73fbfad3e7dba056ad4b4a7590048c..c64bfa32482c0683387d9708509043a37073fa87 100644 (file)
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index fe1fd153b701a4ecfd5ac95b3b2a056e34e2616f..0b776115ca8f001e6f88047635d1c88e0c2b343b 100644 (file)
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/nu.h b/src/m/nu.h
index 01fadeba18ae50a546c94329e7cd4311674d3ba1..347606a6c01c22f439ead4f74b2d59cf9c23f37d 100644 (file)
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/orion.h b/src/m/orion.h
index 472b7b4c8eb3fdcd89a08eb01d7ffd5e7254979c..36a74b3cc3bc88e7824d22d9649cb59e45549522 100644 (file)
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/orion105.h b/src/m/orion105.h
index 586ddf2ea354ced1f37486def38243565372cc61..73408ed1b2fe4e2caec01c7e3ce995fb2afeefa1 100644 (file)
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index 3c13aa77872c356ea861fa03e067d9fa46ebe271..8f1f146000e44587c02b84ed876607308da845c0 100644 (file)
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/plexus.h b/src/m/plexus.h
index 606caeb20f4c035db089e23147630b1a1bb381ce..4a4e6a32f7f8f9ec329ac21421d932909fca2887 100644 (file)
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/pmax.h b/src/m/pmax.h
index 1f2869a09d38ba299fbb60b77e0496fa1c4dd26d..fbeba17c9e3dc25e6c1511fadf3aa3daa59cd0be 100644 (file)
--- a/src/m/pmax.h
+++ b/src/m/pmax.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/powermac.h b/src/m/powermac.h
index 419edb21b9f6938b0165e195931255d55111995a..729bbb0358b1956c751e45355824a2bb84418d2f 100644 (file)
--- a/src/m/powermac.h
+++ b/src/m/powermac.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h
index fb70cbfcb4f65764a3ac08af2f07a1b762904c9a..403d6986bf808f8400aeef3c0051b0674f2046ca 100644 (file)
--- a/src/m/powerpcle.h
+++ b/src/m/powerpcle.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index 9a07ff09f1d4e21ff3cd54cf81ee4b79a1999229..9ee3fefe3874cd69635973a3fc3948266abd29b9 100644 (file)
--- a/src/m/pyramid.h
+++ b/src/m/pyramid.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h
index 03a0bff3e12629f2682db7b8dd7aa12813a3a016..8f915638a1ac6af9c67f8c1e85db66e78e60a019 100644 (file)
--- a/src/m/sequent-ptx.h
+++ b/src/m/sequent-ptx.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/sequent.h b/src/m/sequent.h
index d00516428263aafe5afbbfaa3e3dcb7bc917e817..be5d3f19bd188b0bebbd252d31cac72dd1ea0771 100644 (file)
--- a/src/m/sequent.h
+++ b/src/m/sequent.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/sh3el.h b/src/m/sh3el.h
index 9c510979bdc68625c2c4631e4c805ebbd19dfafd..5851ade152374b8daefacd05ae446855053aea56 100644 (file)
--- a/src/m/sh3el.h
+++ b/src/m/sh3el.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/sparc.h b/src/m/sparc.h
index 3efb4c05553d312ec9501f26212018ca2f4588e2..f59c2c2b969ad65e0df6200cde312dd4a696cce8 100644 (file)
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/sps7.h b/src/m/sps7.h
index db6c9d3a91ef6680827ef676ed4e11b4874ff8e1..68acf2c6c529e4c21e428fed006b24d096087f21 100644 (file)
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/sr2k.h b/src/m/sr2k.h
index 2342bf8ef206e37ad85908b3ae2506bd55c88797..ba4a9a905ab2108cdaf6f0b0a00bc25db3edab72 100644 (file)
--- a/src/m/sr2k.h
+++ b/src/m/sr2k.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/stride.h b/src/m/stride.h
index 8acc84e3cbe5be18772e52d6f6107a8854fa214d..cb0380024a1693ab3dffbd77dd0336debafeca84 100644 (file)
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/sun1.h b/src/m/sun1.h
index 526056dd80f3ac1812e476f5696dd68dbcfca47f..fda451a9310ce635a9c413c303fde5732018335d 100644 (file)
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/sun2.h b/src/m/sun2.h
index cee54da79b79a22c5cc99437c6258e4390656e70..00b7ae97c4d0da69a4581ececab1638f944530db 100644 (file)
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/sun386.h b/src/m/sun386.h
index 21a07a6942323c31002cdded1c5b273557c469eb..a3eedbe755ee9610d20764035f9a9f84a7fc814a 100644 (file)
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -9,7 +9,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index 39dde99f13ce2bc28a26a628eaaa5cc624ea3586..ea3d9493504aab1405c766640864c2b1bac36101 100644 (file)
--- a/src/m/symmetry.h
+++ b/src/m/symmetry.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index 357bbe809826f514f7b83d3fe1c0dc5f4c06148e..5e982a314ab82db9ae8e8dcf6528a729a0e54165 100644 (file)
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index c28018a149dd63a2311c18f0d8074a9e4b3e93fb..8fe41cd410911927ef56ef3102a88194253cd982 100644 (file)
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/targon31.h b/src/m/targon31.h
index 34e3ae40c9e929f7ea7b4492319ace0aec464424..0c657e0ea5de90e58328b24f4db825e683c2a7ce 100644 (file)
--- a/src/m/targon31.h
+++ b/src/m/targon31.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index 30e40a0e09f04e4a68e527740a444ab2bb0d3887..be43210212ad272690f51b22f47e43dad0ac2a0b 100644 (file)
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index 3b858310af3dba1f6fba466c886795ddfa9a4b97..1d46bb9bb55e93a315f6b6b1e0dccf42ac89b293 100644 (file)
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/template.h b/src/m/template.h
index 79d2d40ab7034dac94c8aa0c8ac253deecbfc1e5..fccc5b0901c1808d0d41941fd7b69596fab06189 100644 (file)
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/tower32.h b/src/m/tower32.h
index cdb6884d5fc1371207066db82390fd009a9942cd..0ce623b7f3717815047fdfd265156d5ebdb7bcca 100644 (file)
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index 19e7d3ba7ea712a8756f93d4870b1f7513ce5ed1..226c0e2640a97f9ef4205aaf1eb89b982f5e4b50 100644 (file)
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/ustation.h b/src/m/ustation.h
index b662cca208e91625c29d94697764f2e84c017a06..f88cdc5ee63b107ece9a4a7c1cb5cd46dbc6e082 100644 (file)
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/vax.h b/src/m/vax.h
index fae30d37f73e702e6910c86198dc791ce8472e61..80844ba3ba6eb45e16c8e571b5a08509cb9b439e 100644 (file)
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/wicat.h b/src/m/wicat.h
index 6ab0a498104b77944bd5a7d0d9f5c449ae25acc7..67409844666865061a394a3f9c160823249018ce 100644 (file)
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h
index 223958375ca86105f22b6aa36cff0525aad728c7..f1efe64a4f5405cfa53055f9e9758d690f5add22 100644 (file)
--- a/src/m/windowsnt.h
+++ b/src/m/windowsnt.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/m/xps100.h b/src/m/xps100.h
index 89300211eec1325a4d645183a528e889a15255b5..691f5fedbd6745fe9d770cc3ad0faf5f8329836a 100644 (file)
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index 204baa40f0783e50cf676b2c12218c4c954e5073..1110062605edce262c291fbe338810a36fd438c7 100644 (file)
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/aix3-2.h b/src/s/aix3-2.h
index e745b8dc81b4f485b9efa56787b1662bfc8ec02f..140f420280671aea428a84a3c929a7db7b7653a7 100644 (file)
--- a/src/s/aix3-2.h
+++ b/src/s/aix3-2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/aix4-1.h b/src/s/aix4-1.h
index 49d866a7d7b019598b1c228f2bcc053ccefddf4d..704550c80ee249d8a56f0916b0aacfc41db86d11 100644 (file)
--- a/src/s/aix4-1.h
+++ b/src/s/aix4-1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/bsd386.h b/src/s/bsd386.h
index a3d0983ca253ea9c287ea31d13c0b8850c370e79..1a2f7b7efa1abfe9d2fa17eae813e78f6e75f3ab 100644 (file)
--- a/src/s/bsd386.h
+++ b/src/s/bsd386.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index 2b11ba2302f869f0926d2b1606817932f93584f1..e82a06bd6ae2ca40969a43efb9856d83fa93c2a4 100644 (file)
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index 40c655bea87d3a09f031a8b5dcb612077aaab488..00c1d326527c2b8932fdf3181dbb7b5ef3974511 100644 (file)
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index 249cf34f41b61ba410190553e8c9b10c3a5bc019..f0bb14af69c4c27a8dfaacd9a6154bddb838336f 100644 (file)
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/cxux.h b/src/s/cxux.h
index daed2fc85d8527c6d34f921e7fc325413eb1870f..d5abebf1ae155666e4977a7095f12241e160743d 100644 (file)
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index eff48e339cbc9c46050d8fcde6377afb070b138f..3c0d9c410a0f1ee9def69dc98bba4a65275c80fe 100644 (file)
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/darwin.h b/src/s/darwin.h
index cb032429f7de53f12bdf3b7d54daa97aa27fe46c..183aecaf5d8db0a4c04e0aeca9098581da5299eb 100644 (file)
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/dgux.h b/src/s/dgux.h
index 62194a2fc6e075f340400be913469fc9ba66d022..f7ce0a6fd38b9d0e618f9e3d75872674d411975c 100644 (file)
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/dgux4.h b/src/s/dgux4.h
index 01d75650e6fe4c834004f392766b7ced46a9dcd9..bf5a1b0e597659a7c32670d7e73a2f70d5243c8d 100644 (file)
--- a/src/s/dgux4.h
+++ b/src/s/dgux4.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h
index c9f471af05a7558448a1af39b1416af877123bea..d959b8c6f1bd15f8d7f882b22ba84acea178ac13 100644 (file)
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h
index fef2da7d29dd294d50f55adcd075e092c1489a75..570e90e9ac11456e0cc0c5ab75f490faa6e7b8f8 100644 (file)
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 3adca71bebc9ea5a2315859d40bc085f8ad1891a..a9604057c36b078311b4f0fb6512f4cbf3389f84 100644 (file)
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 24a37f964dbc887e2ae2b3fbfbbbf3022c61dedf..64dbe2011735edfd4141e4e34eadabca1e0142a9 100644 (file)
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/gnu.h b/src/s/gnu.h
index c4f1a798d9e4b9917fc6246bae561dd8b961deae..4d548838594a9c4f0e363739c7ee1deffdbc2a09 100644 (file)
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/hiuxmpp.h b/src/s/hiuxmpp.h
index 7e05b2e8ca0ee8023b9c5cb83b7cb163b52f87ee..7538adb16349d0bfd04419e7ab6ef7d41653ffed 100644 (file)
--- a/src/s/hiuxmpp.h
+++ b/src/s/hiuxmpp.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/hiuxwe2.h b/src/s/hiuxwe2.h
index 68973d19cd382b58feeb3746d2a657b0ac2d2125..418ea14cc99aff7241b414c529fb229dc26c224b 100644 (file)
--- a/src/s/hiuxwe2.h
+++ b/src/s/hiuxwe2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/hpux.h b/src/s/hpux.h
index c0419fbad46029d6cab26c9df94f754db6871302..5f407a661e1b79ebb7da62369320dc5782d77fc2 100644 (file)
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/hpux10.h b/src/s/hpux10.h
index 8f9e87a67a1b3c0b5a86461734bc1816d7d22b2b..8edcfa19633cf074f242e4e7917e599d58063a54 100644 (file)
--- a/src/s/hpux10.h
+++ b/src/s/hpux10.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/hpux8.h b/src/s/hpux8.h
index d8d1bd368bbc41688ec6b0621472eb3ee7a422d5..ea8e30fb282b2f13a949f90416f1347556df1135 100644 (file)
--- a/src/s/hpux8.h
+++ b/src/s/hpux8.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/hpux9.h b/src/s/hpux9.h
index d34c56c345bb7dc57248fea2dfd91a04ec2f0772..cc45673089f3281fb5f048aaa5d53dee0cfe6999 100644 (file)
--- a/src/s/hpux9.h
+++ b/src/s/hpux9.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index abbd945ab2fba5c3f12432a21376ea791362c45a..c3d16cbf611e0dee46c00d72e8df846175c40543 100644 (file)
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index 192118eeca7f40c3ab72cff3677e105fd972b549..85a13167ed0d0486c081b8a5e124dd67e5c8e908 100644 (file)
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index 1512077fe49b6fd65e6a46aa3f8612a6bebc679a..b58283d584c4c461397d9469c38f0f50a86cb121 100644 (file)
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/irix4-0.h b/src/s/irix4-0.h
index 6fbe2478966a48893dc2bef050e3231b5d474a84..35fcae95e43ebc3c17d09ee3dad0e2ba6c7ebe75 100644 (file)
--- a/src/s/irix4-0.h
+++ b/src/s/irix4-0.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/irix5-0.h b/src/s/irix5-0.h
index a932e3157849b2b6f6b7ba77c16970dae6953a2c..e1aca54690917b13907d194c005c6f8b3a11240a 100644 (file)
--- a/src/s/irix5-0.h
+++ b/src/s/irix5-0.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/irix6-0.h b/src/s/irix6-0.h
index bc24474ba73b0f095f4af68b280707b3be49905a..53fdbd1b8f72627796c2a830b02e15b4d1fda7ca 100644 (file)
--- a/src/s/irix6-0.h
+++ b/src/s/irix6-0.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 9a53e16257ef261f35b7c896c37938c0f9d22b7d..ce92b4b430aae8d2a9fb2021e68e5d18314da169 100644 (file)
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/isc2-2.h b/src/s/isc2-2.h
index 3d4565707093334026df74a5e1b3967a34e64ec7..34c79f17ea1660c38b26f8279e75e7e7f2829830 100644 (file)
--- a/src/s/isc2-2.h
+++ b/src/s/isc2-2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/isc3-0.h b/src/s/isc3-0.h
index 6b7d20a37d0de9fc6ccfe9c458a2608a2adb7268..3df55031778562c2cfeba2e0e1ff6d69491b4ce2 100644 (file)
--- a/src/s/isc3-0.h
+++ b/src/s/isc3-0.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/lynxos.h b/src/s/lynxos.h
index faa036037f59e2de3f8d4704331274027d9b1114..b2bf5ba418696c209ade42f39206926faaeb1155 100644 (file)
--- a/src/s/lynxos.h
+++ b/src/s/lynxos.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 666b70b1ea5a6929fea28929acd09d57bc4dc1bb..a5898410b3b39e11bbe29e6f23d88ccc9c2807ca 100644 (file)
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/msdos.h b/src/s/msdos.h
index 0bb5a678ae3a21e2b307c554103bfde895e2cdcd..1024651381110523808f75e5aca08b821ae171da 100644 (file)
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 5fab025ae2a78cd1385178db3778483da4eec754..591c0548491ed4def3e7ed10885dcbbd1d073d8b 100644 (file)
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index b548a47ffbe26bca58e6de1aa327175145033fec..9e149bc5ed00f009c59c9e6c222bca239b6d5cef 100644 (file)
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 2923712d92994b7b5688bf9694012841c8fbe518..5a5dd6a3693e0f8f4d0dbfa4cce07db3b5e0f019 100644 (file)
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/osf1.h b/src/s/osf1.h
index 04670b3d9a54701a3403aaf789c6c610173fab40..7e55ce4fb6dc0c773b7d2627faed46873ec068bc 100644 (file)
--- a/src/s/osf1.h
+++ b/src/s/osf1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/ptx.h b/src/s/ptx.h
index edbbe5b2ac4e84f12ffb65072675ddd755050ca5..d192bd6098af3f6ab15c2b6e30dad9978ae66493 100644 (file)
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/ptx4.h b/src/s/ptx4.h
index af59d3996644647794a7a848f059675d06e12269..d955234afd41908e37188433ec1d4466665d6d7b 100644 (file)
--- a/src/s/ptx4.h
+++ b/src/s/ptx4.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h
index 682ba06720ad223a7a69aef54c846fa06621be84..6fd22fbb75003e68915a720b9183c80ab970e4de 100644 (file)
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/riscix12.h b/src/s/riscix12.h
index d082e442810ebae587a576ebb62f29967a87069e..cc81c7da1c7827ff0ed0d79730c3430cc1b3a95c 100644 (file)
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/rtu.h b/src/s/rtu.h
index 1517165877ba911f6d393160dbfc1198dfee9494..6dd8fa5a2083b1a869db07f2a445d543f96336cb 100644 (file)
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/sco4.h b/src/s/sco4.h
index 96e812ce0e428d86bae942cb6d74a24de3fa4c31..4912b275aaaf817e78125e1c3d3575842347c93d 100644 (file)
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/sco5.h b/src/s/sco5.h
index 6ab7b60e4668e3f92ef7a7b85e2cf9f74cb85d4c..a5cc19656ab4ec5622a4833ddc125122fd5f3a11 100644 (file)
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/sol2-3.h b/src/s/sol2-3.h
index 08964d733e2797b98a164712281e207426320ed8..ca9aa84ad6a617960ffc3d5d8c6e443f4dd5f8bf 100644 (file)
--- a/src/s/sol2-3.h
+++ b/src/s/sol2-3.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/sol2.h b/src/s/sol2.h
index 711d12123a39dc8afb662e68691d4746fe567c4b..73662c0fa31271103c49fbdba49659a03e079892 100644 (file)
--- a/src/s/sol2.h
+++ b/src/s/sol2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/sunos4-0.h b/src/s/sunos4-0.h
index a107b609a0cbcb91f327c5a2503b14f294483698..bf77812f32ce4e7963fa5928efe0c51dc4812882 100644 (file)
--- a/src/s/sunos4-0.h
+++ b/src/s/sunos4-0.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/sunos4shr.h b/src/s/sunos4shr.h
index aac3340a029960d74bd0883f59164ad81c319008..5ebbae3a0a228960563ffc42fe35e5805f946a14 100644 (file)
--- a/src/s/sunos4shr.h
+++ b/src/s/sunos4shr.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/template.h b/src/s/template.h
index c16b12971ad7c8bb91a77c70a61c3c6a923d84d5..23e1372aedaee8b67d57473c22c7b07c84950c7c 100644 (file)
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/umax.h b/src/s/umax.h
index 5d379ea398a086dd7d52d9a1a31351a65c4c3fbe..aa73faa49171f763583da580a26aebe2f60f9b42 100644 (file)
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index 0d4aba8ea2b95f9dfdefbe5bb8485fcc66070a24..5730fa652842dc7dacf30c6d280f11cc57aa010a 100644 (file)
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index 101e75726ef06a60fb780d29d7524693a026da26..9babf201e9f749ae2054f7290809f16e405eb512 100644 (file)
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index b2c89a1abdceb533ea0a9d099d74f15073bea7b9..607c0c6190401bb0172dea93c99ee396c39f54ea 100644 (file)
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 13a9885fb535d3f6a9318386d2410b3da166d84a..36588aecb9b28676e72e0530f6c44eb8d500e12f 100644 (file)
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index 0e0a1c84829fa3fa2aa70339937663a3c5e52778..d9b537184882a951f5bed2dfacc8f33a30e2480f 100644 (file)
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/usg5-4-2.h b/src/s/usg5-4-2.h
index 56b2a34581487a6934c37cbe59c3410bd01d22c8..b1616941da913b1d2608dfaf909924a4a26e9096 100644 (file)
--- a/src/s/usg5-4-2.h
+++ b/src/s/usg5-4-2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 4ca5b6fcabcdd052830a3bed159d98df48e3da22..3dc05f3e9fd8aca9648724419c0c531863913124 100644 (file)
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/vms.h b/src/s/vms.h
index 4d9bbaebb07d27e2a9f222de18a7c7f83cf1a7ce..c526b6c51350e2bc796246012680536250bea64b 100644 (file)
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/src/s/xenix.h b/src/s/xenix.h
index 6d77ef50acc3c9875e8c437aa771d6b8e2a20376..c5b3cf225e04c696c33b7b38fe4a4ac3df19d205 100644 (file)
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,

diff --git a/vms/make-mms-derivative.el b/vms/make-mms-derivative.el
index 4d226374cfd0f1b021cf536c780c92aa4c196b2f..3f1c53778ecde040576374e1c5893bcdb04fa6e5 100644 (file)
--- a/vms/make-mms-derivative.el
+++ b/vms/make-mms-derivative.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,