Switch license to GPLv3 or later.

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

diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index 4c16d471e86f5c18c221f14beafd8e5b894d93c0..5ed16bb2f81629b266367638358445508e30c2db 100644 (file)
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -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/lisp/url/url-auth.el b/lisp/url/url-auth.el
index c786887f1f62662991d94d6d0e80976187666b54..c57a96cc81b896a6c7aba425c2871f8f15d20fdc 100644 (file)
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.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,

diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index f0802602c3f26837f4c416110ab5d185841dcadd..8fbe01d472a1b9a512e8e855271832441392489a 100644 (file)
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.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,

diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index 6e3369f388b4a4e36217a4b90bd00c9a55340e95..d644a7d359e4f5c997110753556c2f35f20f9988 100644 (file)
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -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/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 8d729c923693379aae2d0720830e6db0ee22ce3d..cdca65104adc37d1acf667cb3f76acd6d8bf4c9b 100644 (file)
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.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,

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

diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index 404068264af2ce571e4a0230f44177ec51a5f688..189628468b7882b43ebb49e6d03951c944f10a2d 100644 (file)
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.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,

diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index 43e6e18791b833bc02db62101152191927776d83..7b3b105d951c3d113202a825418dcfd4944b6634 100644 (file)
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -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/lisp/url/url-file.el b/lisp/url/url-file.el
index 1ad2e09e976f82ee1a4f137d4744ecdd04b3e033..e899493f1cede7a40ee689524cbd72b78d9f519c 100644 (file)
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.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,

diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index 67a4b0914659b34328eaa92c7173e0677270d076..8f2570586c73b6004bb56457e3725f9677ca88a4 100644 (file)
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.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,

diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index b2768212721fa4bee73e92cebf473663f5de4f52..998d1f41900a944457d3a9b577e00d69e444f996 100644 (file)
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.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,

diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 91ac355a8c481212e26f31898a1f2639e9f9dad3..d6776c238e0264472adc5a813de2cb11109d523e 100644 (file)
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.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,

diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index d595b1a14b059cdc8511b6b470104c78798d4f20..1ed3c71174ede4cc0e914ca1d90889db554621a2 100644 (file)
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.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,

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index d9ac81838d4dfe1c5d0fe3b5743bb2541838b5ef..148449d41cf630af0fd6667b74c143cab2ad4f7d 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.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,

diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index da3fd887e3f0152462dcd31cbc95bbba7b7e4776..5c5dff31f7660010a7788800abf9626450738d92 100644 (file)
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.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,

diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index b00b897a92cbf06ace25083c143cd15ff69a46a9..0cefb375bf38ae1a1ef556c1eb2e97208bf6bc36 100644 (file)
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.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,

diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index b50bd714aa649c8bab71fd0409f3983cbdadcd55..50b665a0821bae86ce1ae6465b778a808c522fc5 100644 (file)
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -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/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index 6585ba8e4581dd2a31805e89f4a10b153d6738df..10d08b9633ff355a426990a8409cc782666b871c 100644 (file)
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.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,

diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index f29364f3499a3b0d0dbf96254b0bd7ccf8eace65..89c36bec73735ff010bf3684d3dd55e7c55a0d07 100644 (file)
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.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,

diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index 11771537ca2704e466a14d1411ff2e028af9aee9..a793cacc5bc9ed3287b4ef92c723465ce2308618 100644 (file)
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.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,

diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index ab3c3ae31adff4d1e2612970a32e1c0518e416ad..48f332fe7a063df41bba06d677fa872d94bd253d 100644 (file)
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.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,

diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index 4f06f5e5bb302d530002fb56f17fe1255c79e708..ed21434cad04c13ee701b6b923210002d94cb8ff 100644 (file)
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.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,

diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index c460a423b6447fbfe669d5c6430678bce3639bb3..85053b819b968345bf5b174589318e36f7713d65 100644 (file)
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.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,

diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index a9a0fb151e9ca5117382e854275133c9436dc676..3dfc7ac86a206366fd88845efa1d9b2cc487f991 100644 (file)
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.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,

diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index 0ea93b1857e01712c48b421b7158fd9306e88a87..6c29474752b3b248d7d7f8e1afe646ebf2695042 100644 (file)
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.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,

diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index 76bea8d14351b534100170d2e208664d685f5eba..4984990a3fec46d5e57e7115d720219364dc7278 100644 (file)
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -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/lisp/url/url-util.el b/lisp/url/url-util.el
index db7aac78bfdf8b2e52859b23b55d702c0805748f..fa971da5d17d578be2a7d6c056e9376657e52049 100644 (file)
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -10,7 +10,7 @@
 ;;
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 ;;
 ;; GNU Emacs is distributed in the hope that it will be useful,

diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index d0bd9a84c0590758b731ab10d085fa7e1a58b98c..35e69e7990b9c7deb9081f6098a5ef08013c1e31 100644 (file)
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.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,

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

diff --git a/lisp/url/vc-dav.el b/lisp/url/vc-dav.el
index b19f43a64be2695aea8418981af18ee7103d2577..ce0d3275a5ff5bb84309792a563feba204a21305 100644 (file)
--- a/lisp/url/vc-dav.el
+++ b/lisp/url/vc-dav.el
@@ -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,