r23780: Find and fix more GPL2 -> GPL3.

Jeremy.
(This used to be commit c2f7ab1c175ecff0cf44d0bbc4763ba9f7d7803f)

diff --git a/examples/VFS/config.guess b/examples/VFS/config.guess
index d0d57f6945f853939b6597110a7519a4d5224d7a..7e19c0b26109d97254160848d05e33df24948f52 100755 (executable)
--- a/examples/VFS/config.guess
+++ b/examples/VFS/config.guess
@@ -7,7 +7,7 @@ timestamp='2005-09-19'
 
 # 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
 
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but

diff --git a/examples/VFS/config.sub b/examples/VFS/config.sub
index 1c366dfde9ab35fe6474af49933455433951457f..f0fcaf636114eea8944ff7130e33b76d7ceaf9bc 100755 (executable)
--- a/examples/VFS/config.sub
+++ b/examples/VFS/config.sub
@@ -11,7 +11,7 @@ timestamp='2005-07-08'
 #
 # 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
 #
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/COPYING b/examples/pcap2nbench/COPYING
index a43ea2126fb6b114bff5f8e003ee118e045dacf1..441ad12f9ad131616dadb437038a5cea33dec67a 100644 (file)
--- a/examples/pcap2nbench/COPYING
+++ b/examples/pcap2nbench/COPYING
@@ -295,7 +295,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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
 
     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
+    the Free Software Foundation; either version 3 of the License, or

     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/Makefile b/examples/pcap2nbench/Makefile
index fd717944c5b1b69225f3ff6e5ef67dc96b0af753..0e3a1a5f588469448d390b8e30c6a66150cfdde8 100644 (file)
--- a/examples/pcap2nbench/Makefile
+++ b/examples/pcap2nbench/Makefile
@@ -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
 ##
 ##  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
+##  the Free Software Foundation; either version 3 of the License, or

 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,
 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/closerequest.cpp b/examples/pcap2nbench/closerequest.cpp
index 8487847b530ff1b38ece80ed991cd0ddd5425ce0..e870eb2996c8f5787e0cf8c44fb6f561fd36fbbe 100644 (file)
--- a/examples/pcap2nbench/closerequest.cpp
+++ b/examples/pcap2nbench/closerequest.cpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/closerequest.hpp b/examples/pcap2nbench/closerequest.hpp
index daf7ee5709d8058a86b9e73caa0c2c51ec00d009..cfacae2b38b776c37723e373fc4a735c224e04c1 100644 (file)
--- a/examples/pcap2nbench/closerequest.hpp
+++ b/examples/pcap2nbench/closerequest.hpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/ethernet.cpp b/examples/pcap2nbench/ethernet.cpp
index 7fd4f1e421982768f161de10cd9bf2a55256e21f..2077591ef763b16bb26b62b7ec2019391e831b87 100644 (file)
--- a/examples/pcap2nbench/ethernet.cpp
+++ b/examples/pcap2nbench/ethernet.cpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/ethernet.hpp b/examples/pcap2nbench/ethernet.hpp
index d00131638ab54ece48422b9b4cd8e908ca094ba0..455619fd52a84a20a3f7670c919961f8b7d17a41 100644 (file)
--- a/examples/pcap2nbench/ethernet.hpp
+++ b/examples/pcap2nbench/ethernet.hpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/ip.cpp b/examples/pcap2nbench/ip.cpp
index 02404c1d3cebed855d0a4c172e6abef92df8d65a..34bdc6edf120dc8f562ddd206e361a7b3faa4cd0 100644 (file)
--- a/examples/pcap2nbench/ip.cpp
+++ b/examples/pcap2nbench/ip.cpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/ip.hpp b/examples/pcap2nbench/ip.hpp
index 6eca46e8545eb145ac45740ded3601c3d0062516..8c57e0e403817d2e2613895bfc2eadef2e94edc9 100644 (file)
--- a/examples/pcap2nbench/ip.hpp
+++ b/examples/pcap2nbench/ip.hpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/main.cpp b/examples/pcap2nbench/main.cpp
index 850594620566cae6986ad79aaa058ca5723ea9a8..460136fe2a674fe4edd80909fdb2427c5eb36e29 100644 (file)
--- a/examples/pcap2nbench/main.cpp
+++ b/examples/pcap2nbench/main.cpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/ntcreateandxrequest.cpp b/examples/pcap2nbench/ntcreateandxrequest.cpp
index d7024611f6b45bc6689363e124e0f8652fe71f9b..7154fe7831ed04438553cdeeb7ec498fe2e169fa 100644 (file)
--- a/examples/pcap2nbench/ntcreateandxrequest.cpp
+++ b/examples/pcap2nbench/ntcreateandxrequest.cpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/ntcreateandxrequest.hpp b/examples/pcap2nbench/ntcreateandxrequest.hpp
index 0e80c8830861d43b68eb3cfd3c111b0b0194111b..be0663e79df0fab97fae264cbfda04c9264a89f4 100644 (file)
--- a/examples/pcap2nbench/ntcreateandxrequest.hpp
+++ b/examples/pcap2nbench/ntcreateandxrequest.hpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/ntcreateandxresponse.cpp b/examples/pcap2nbench/ntcreateandxresponse.cpp
index 5f2ab0277729dfb59972ebb05c8bf3894c126333..32b31d1500c88378938e83ad3bcb905924aaab79 100644 (file)
--- a/examples/pcap2nbench/ntcreateandxresponse.cpp
+++ b/examples/pcap2nbench/ntcreateandxresponse.cpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/ntcreateandxresponse.hpp b/examples/pcap2nbench/ntcreateandxresponse.hpp
index fbe2f0cfbbad43f96ac3da67aa24f3a0aa2a790f..69c65c257c0737b37fedbd0d75e8a193bf6520ba 100644 (file)
--- a/examples/pcap2nbench/ntcreateandxresponse.hpp
+++ b/examples/pcap2nbench/ntcreateandxresponse.hpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/readandxrequest.cpp b/examples/pcap2nbench/readandxrequest.cpp
index a903deeecbdc79b2458dabe68b55d0d483226293..fd67b887a81ff552f7eded38575a7a1e2094ec65 100644 (file)
--- a/examples/pcap2nbench/readandxrequest.cpp
+++ b/examples/pcap2nbench/readandxrequest.cpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/readandxrequest.hpp b/examples/pcap2nbench/readandxrequest.hpp
index 6b590f882f64d88579adffe8e543716360dedad1..c44a627fa87784f4a9e39f272010bd26a8f481a0 100644 (file)
--- a/examples/pcap2nbench/readandxrequest.hpp
+++ b/examples/pcap2nbench/readandxrequest.hpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/readandxresponse.hpp b/examples/pcap2nbench/readandxresponse.hpp
index 84ac07b9694de7a9e5a12db7508886ef90e9b6ff..75834c738fea3a4b19afb3761d3ba3f18c70c21b 100644 (file)
--- a/examples/pcap2nbench/readandxresponse.hpp
+++ b/examples/pcap2nbench/readandxresponse.hpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/smb.cpp b/examples/pcap2nbench/smb.cpp
index df3f84b4afa0b87d3b137eef6a7083cb575cdd1e..87f1ab46cc7815bb69b90d28814d8246350ee89e 100644 (file)
--- a/examples/pcap2nbench/smb.cpp
+++ b/examples/pcap2nbench/smb.cpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/smb.hpp b/examples/pcap2nbench/smb.hpp
index 8afda670d2745e37c5eb4905538eb90715774ef7..5cc33621ac73697d170c71be48451c17a55b050d 100644 (file)
--- a/examples/pcap2nbench/smb.hpp
+++ b/examples/pcap2nbench/smb.hpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/tcp.cpp b/examples/pcap2nbench/tcp.cpp
index 3dff4bda31de811a8fc516a36377b11f373fc338..ccec915121203ea104c352e6f8bd37fa3766a82c 100644 (file)
--- a/examples/pcap2nbench/tcp.cpp
+++ b/examples/pcap2nbench/tcp.cpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/tcp.hpp b/examples/pcap2nbench/tcp.hpp
index f659499f7e90b65949a8bf99c2c65b791f75a950..7cee717527e433d7dde74b1340f342139eb93c5d 100644 (file)
--- a/examples/pcap2nbench/tcp.hpp
+++ b/examples/pcap2nbench/tcp.hpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/writeandxrequest.cpp b/examples/pcap2nbench/writeandxrequest.cpp
index 68c5a2b05d1402de107adc553e5ede2157b37236..c81f99686849bd6e6a3d0e2b88621af8ca6459e2 100644 (file)
--- a/examples/pcap2nbench/writeandxrequest.cpp
+++ b/examples/pcap2nbench/writeandxrequest.cpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/pcap2nbench/writeandxrequest.hpp b/examples/pcap2nbench/writeandxrequest.hpp
index 3a0c84008e6d6626253c179d2e74ef7a7ab4d420..55c49441f0f25018df6e282c4ae7993c6865775e 100644 (file)
--- a/examples/pcap2nbench/writeandxrequest.hpp
+++ b/examples/pcap2nbench/writeandxrequest.hpp
@@ -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
  *
  *  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
+ *  the Free Software Foundation; either version 3 of the License, or

  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/examples/perfcounter/Makefile b/examples/perfcounter/Makefile
index e74b7361016a6ab03cbac0ced1c92fa5c54a6bfc..ce480578a5a61ce50b951900b07080b98bc5a9eb 100644 (file)
--- a/examples/perfcounter/Makefile
+++ b/examples/perfcounter/Makefile
@@ -3,7 +3,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
 #  
 # 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
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,

diff --git a/examples/perfcounter/perfcountd.init b/examples/perfcounter/perfcountd.init
index bb4148e52f62d8053313e32630de4e2587e461bd..d28138ff7590e492b08b041333cf197598905ae7 100755 (executable)
--- a/examples/perfcounter/perfcountd.init
+++ b/examples/perfcounter/perfcountd.init
@@ -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
 #
 # 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
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

diff --git a/examples/printing/VampireDriversFunctions b/examples/printing/VampireDriversFunctions
index ea0cf4729542b5fb3496376c0419f649d7db354d..ec00d21bb2e4dee8f35f2d616d4353f75cae3bf7 100644 (file)
--- a/examples/printing/VampireDriversFunctions
+++ b/examples/printing/VampireDriversFunctions
@@ -8,7 +8,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
 ##
 ##  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
+##  the Free Software Foundation; either version 3 of the License, or

 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,
 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,

diff --git a/examples/scripts/eventlog/parselog.pl b/examples/scripts/eventlog/parselog.pl
index 61a07542da6b5fe59d7c1a0e72318d751f944da4..3fe1fa9b6a08235895f7575082557531b69f307f 100644 (file)
--- a/examples/scripts/eventlog/parselog.pl
+++ b/examples/scripts/eventlog/parselog.pl
@@ -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
 ##
 ##  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
+##  the Free Software Foundation; either version 3 of the License, or

 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,
 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,

diff --git a/examples/scripts/shares/perl/modify_samba_config.pl b/examples/scripts/shares/perl/modify_samba_config.pl
index aaf2958a95a30e870379270f37ff59f4217e3132..3a566d1e810ae355c75419d475c8a69119e58b33 100755 (executable)
--- a/examples/scripts/shares/perl/modify_samba_config.pl
+++ b/examples/scripts/shares/perl/modify_samba_config.pl
@@ -8,7 +8,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
 ##
 ##  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
+##  the Free Software Foundation; either version 3 of the License, or

 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,
 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,

diff --git a/examples/scripts/shares/python/SambaConfig.py b/examples/scripts/shares/python/SambaConfig.py
index c70c23118a14d560fc12e658bbad7ad20262ef10..e0689e3bd4690bcd3e72c157799a3daedfbf55d8 100644 (file)
--- a/examples/scripts/shares/python/SambaConfig.py
+++ b/examples/scripts/shares/python/SambaConfig.py
@@ -9,7 +9,7 @@ from smbparm import parm_table
 ##
 ##  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
 ##
 ##  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
+##  the Free Software Foundation; either version 3 of the License, or

 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,
 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,

diff --git a/examples/scripts/shares/python/SambaParm.py b/examples/scripts/shares/python/SambaParm.py
index 292ad42cd2aa319c5360ed1243e74b8c74e0c7e0..4933a2f702cac2fd0ffd42ea50a527988f59bcf4 100644 (file)
--- a/examples/scripts/shares/python/SambaParm.py
+++ b/examples/scripts/shares/python/SambaParm.py
@@ -6,7 +6,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
 ##
 ##  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
+##  the Free Software Foundation; either version 3 of the License, or

 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,
 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,

diff --git a/examples/scripts/shares/python/generate_parm_table.py b/examples/scripts/shares/python/generate_parm_table.py
index 1dbc071e9b56d92cc25c6b1d051e2c17c1fe9f08..0d04c2b961d8a7d67b14dd9cced4cf2db20408bc 100755 (executable)
--- a/examples/scripts/shares/python/generate_parm_table.py
+++ b/examples/scripts/shares/python/generate_parm_table.py
@@ -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
 ##
 ##  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
+##  the Free Software Foundation; either version 3 of the License, or

 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,
 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,


@@ -32,7 +32,7 @@ HEADER = """####################################################################
 ##
 ##  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
 ##
 ##  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
+##  the Free Software Foundation; either version 3 of the License, or

 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,
 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,

diff --git a/examples/scripts/shares/python/modify_samba_config.py b/examples/scripts/shares/python/modify_samba_config.py
index 6a4cdcab79d0944a6b2c51a24bf30453da2334eb..5f8d8811b36adb4049465cef159695ecf31a4f77 100755 (executable)
--- a/examples/scripts/shares/python/modify_samba_config.py
+++ b/examples/scripts/shares/python/modify_samba_config.py
@@ -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
 ##
 ##  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
+##  the Free Software Foundation; either version 3 of the License, or

 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,
 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,

diff --git a/examples/scripts/shares/python/smbparm.py b/examples/scripts/shares/python/smbparm.py
index 0dfcf0062ec8c6d3a11878ca2729c364a0102c07..57e26836d3df861e04c6846d79417a94d7bc3790 100644 (file)
--- a/examples/scripts/shares/python/smbparm.py
+++ b/examples/scripts/shares/python/smbparm.py
@@ -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
 ##
 ##  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
+##  the Free Software Foundation; either version 3 of the License, or

 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,
 ##  (at your option) any later version.
 ##
 ##  This program is distributed in the hope that it will be useful,

diff --git a/examples/scripts/users_and_groups/adduserstogroups.pl b/examples/scripts/users_and_groups/adduserstogroups.pl
index 335dad00aaecb52f49f0b2e528348823b78d2318..52a7d01703d71591f1874e8e5b72b180b32d341b 100755 (executable)
--- a/examples/scripts/users_and_groups/adduserstogroups.pl
+++ b/examples/scripts/users_and_groups/adduserstogroups.pl
@@ -10,7 +10,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
 #
 # 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)
+# Software Foundation; either version 3 of the License, or (at your option)

 # any later version.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # any later version.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT

diff --git a/examples/scripts/users_and_groups/createdomobj.pl b/examples/scripts/users_and_groups/createdomobj.pl
index 6568b216642f304f0b179f40f304f1075eeae62d..36e0c0f9fd080865f2cf9927c0f33dcc0d6d815e 100755 (executable)
--- a/examples/scripts/users_and_groups/createdomobj.pl
+++ b/examples/scripts/users_and_groups/createdomobj.pl
@@ -10,7 +10,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
 #
 # 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)
+# Software Foundation; either version 3 of the License, or (at your option)

 # any later version.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # any later version.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT

diff --git a/source3/config.guess b/source3/config.guess
index d0d57f6945f853939b6597110a7519a4d5224d7a..7e19c0b26109d97254160848d05e33df24948f52 100755 (executable)
--- a/source3/config.guess
+++ b/source3/config.guess
@@ -7,7 +7,7 @@ timestamp='2005-09-19'
 
 # 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
 
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but

diff --git a/source3/config.sub b/source3/config.sub
index 1c366dfde9ab35fe6474af49933455433951457f..f0fcaf636114eea8944ff7130e33b76d7ceaf9bc 100755 (executable)
--- a/source3/config.sub
+++ b/source3/config.sub
@@ -11,7 +11,7 @@ timestamp='2005-07-08'
 #
 # 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
 #
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

diff --git a/source3/lib/ldb/config.guess b/source3/lib/ldb/config.guess
index ad5281e66e9def96e03533881ed570a8a495ccd5..30af5be004980cbd5e0d1f4c4398934476ce7ca6 100755 (executable)
--- a/source3/lib/ldb/config.guess
+++ b/source3/lib/ldb/config.guess
@@ -7,7 +7,7 @@ timestamp='2005-08-03'
 
 # 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
 
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but

diff --git a/source3/lib/ldb/config.sub b/source3/lib/ldb/config.sub
index 1c366dfde9ab35fe6474af49933455433951457f..f0fcaf636114eea8944ff7130e33b76d7ceaf9bc 100755 (executable)
--- a/source3/lib/ldb/config.sub
+++ b/source3/lib/ldb/config.sub
@@ -11,7 +11,7 @@ timestamp='2005-07-08'
 #
 # 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
 #
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

diff --git a/source3/lib/ldb/swig/Ldb.py b/source3/lib/ldb/swig/Ldb.py
index c7e6191c8a6202ccebd156c52701129dda5da87b..8cc7663cc3641b535f29bdfd80f2a423899ac3ce 100644 (file)
--- a/source3/lib/ldb/swig/Ldb.py
+++ b/source3/lib/ldb/swig/Ldb.py
@@ -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
 #
 # 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
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,

diff --git a/source3/lib/replace/config.guess b/source3/lib/replace/config.guess
index ad5281e66e9def96e03533881ed570a8a495ccd5..30af5be004980cbd5e0d1f4c4398934476ce7ca6 100755 (executable)
--- a/source3/lib/replace/config.guess
+++ b/source3/lib/replace/config.guess
@@ -7,7 +7,7 @@ timestamp='2005-08-03'
 
 # 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
 
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but

diff --git a/source3/lib/replace/config.sub b/source3/lib/replace/config.sub
index 1c366dfde9ab35fe6474af49933455433951457f..f0fcaf636114eea8944ff7130e33b76d7ceaf9bc 100755 (executable)
--- a/source3/lib/replace/config.sub
+++ b/source3/lib/replace/config.sub
@@ -11,7 +11,7 @@ timestamp='2005-07-08'
 #
 # 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
 #
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

diff --git a/source3/lib/talloc/config.guess b/source3/lib/talloc/config.guess
index ad5281e66e9def96e03533881ed570a8a495ccd5..30af5be004980cbd5e0d1f4c4398934476ce7ca6 100755 (executable)
--- a/source3/lib/talloc/config.guess
+++ b/source3/lib/talloc/config.guess
@@ -7,7 +7,7 @@ timestamp='2005-08-03'
 
 # 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
 
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but

diff --git a/source3/lib/talloc/config.sub b/source3/lib/talloc/config.sub
index 1c366dfde9ab35fe6474af49933455433951457f..f0fcaf636114eea8944ff7130e33b76d7ceaf9bc 100755 (executable)
--- a/source3/lib/talloc/config.sub
+++ b/source3/lib/talloc/config.sub
@@ -11,7 +11,7 @@ timestamp='2005-07-08'
 #
 # 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
 #
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

diff --git a/source3/lib/talloc/talloc.3.xml b/source3/lib/talloc/talloc.3.xml
index 83ca67a495114308a719f84fef5010540230f15c..ed7466c9ee8cd77aaf196c68b10792f8782f6ea5 100644 (file)
--- a/source3/lib/talloc/talloc.3.xml
+++ b/source3/lib/talloc/talloc.3.xml
@@ -721,7 +721,7 @@ if (ptr) memcpy(ptr, p, strlen(p)+1);</programlisting>
     <para>
       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
     <para>
       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
+      the Free Software Foundation; either version 3 of the License, or (at

       your option) any later version.
     </para>
     <para>
       your option) any later version.
     </para>
     <para>

diff --git a/source3/lib/tdb/config.guess b/source3/lib/tdb/config.guess
index ad5281e66e9def96e03533881ed570a8a495ccd5..30af5be004980cbd5e0d1f4c4398934476ce7ca6 100755 (executable)
--- a/source3/lib/tdb/config.guess
+++ b/source3/lib/tdb/config.guess
@@ -7,7 +7,7 @@ timestamp='2005-08-03'
 
 # 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
 
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but

diff --git a/source3/lib/tdb/config.sub b/source3/lib/tdb/config.sub
index 1c366dfde9ab35fe6474af49933455433951457f..f0fcaf636114eea8944ff7130e33b76d7ceaf9bc 100755 (executable)
--- a/source3/lib/tdb/config.sub
+++ b/source3/lib/tdb/config.sub
@@ -11,7 +11,7 @@ timestamp='2005-07-08'
 #
 # 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
 #
 # 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

diff --git a/source3/lib/tdb/swig/Tdb.py b/source3/lib/tdb/swig/Tdb.py
index aac7a90354d60841726ab8bc3b5e88438b0e7a63..7225638817c30766d3e126f67943699230d63991 100644 (file)
--- a/source3/lib/tdb/swig/Tdb.py
+++ b/source3/lib/tdb/swig/Tdb.py
@@ -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
 #
 # 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
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,

diff --git a/source3/po/de.msg b/source3/po/de.msg
index f5dc79b7247b750659c8c4ac991f95161162136b..6ccd6ebe0c29473c83718a46595bd2d2e73c7027 100644 (file)
--- a/source3/po/de.msg
+++ b/source3/po/de.msg
@@ -3,7 +3,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
 #
 #   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
+#   the Free Software Foundation; either version 3 of the License, or

 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,

diff --git a/source3/po/en.msg b/source3/po/en.msg
index 47d156239f4daae63896e19d81350579582c7353..a3d43faa5ef6bbe61cdb386c657db12be768f112 100644 (file)
--- a/source3/po/en.msg
+++ b/source3/po/en.msg
@@ -3,7 +3,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
 #
 #   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
+#   the Free Software Foundation; either version 3 of the License, or

 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,

diff --git a/source3/po/fi.msg b/source3/po/fi.msg
index 7206ac71a031d578b17eb8a0d66040e1eb82a608..3a15863ce9f6df470ba03f21740a7aef0b609221 100644 (file)
--- a/source3/po/fi.msg
+++ b/source3/po/fi.msg
@@ -3,7 +3,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
 #
 #   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
+#   the Free Software Foundation; either version 3 of the License, or

 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,

diff --git a/source3/po/fr.msg b/source3/po/fr.msg
index 8de5de715006ba8b9f0e3ec05b39917d72fa29e2..39e5e94a945a0853f0ab4ddc60566bb6a4c74dc6 100644 (file)
--- a/source3/po/fr.msg
+++ b/source3/po/fr.msg
@@ -3,7 +3,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
 #
 #   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
+#   the Free Software Foundation; either version 3 of the License, or

 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,

diff --git a/source3/po/genmsg b/source3/po/genmsg
index 08d5bd222f8617ab025b2eaa8f522e6987c7f395..c0c8b53f8e35519d39a10f68a850d423a5c3ee27 100755 (executable)
--- a/source3/po/genmsg
+++ b/source3/po/genmsg
@@ -3,7 +3,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
 #
 #   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
+#   the Free Software Foundation; either version 3 of the License, or

 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,

diff --git a/source3/po/it.msg b/source3/po/it.msg
index c52ee65b85d5424e6ad2571cf9184b4cc55e1439..5989eaa65b1c69a24a643c25fcc529f7cad420e5 100644 (file)
--- a/source3/po/it.msg
+++ b/source3/po/it.msg
@@ -3,7 +3,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
 #
 #   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
+#   the Free Software Foundation; either version 3 of the License, or

 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,

diff --git a/source3/po/ja.msg b/source3/po/ja.msg
index 206351b61723367d3cc620d832b5147c8befad2e..03dd2be17899535b05d384cd5cb4105b21fd614b 100644 (file)
--- a/source3/po/ja.msg
+++ b/source3/po/ja.msg
@@ -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
 #
 #   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
+#   the Free Software Foundation; either version 3 of the License, or

 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,

diff --git a/source3/po/nl.msg b/source3/po/nl.msg
index b9f64234d6e11992b1235c1a4f59ec3203403ee4..d89d45b8f0d28b22604c0eb76da5c30f87619567 100644 (file)
--- a/source3/po/nl.msg
+++ b/source3/po/nl.msg
@@ -3,7 +3,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
 #
 #   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
+#   the Free Software Foundation; either version 3 of the License, or

 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,

diff --git a/source3/po/pl.msg b/source3/po/pl.msg
index 6bc98f99d612d4089230bd3906ed19879e4e5fbe..98d0308e93d121acfad0e16aa84eaca6d195328b 100644 (file)
--- a/source3/po/pl.msg
+++ b/source3/po/pl.msg
@@ -3,7 +3,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
 #
 #   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
+#   the Free Software Foundation; either version 3 of the License, or

 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,

diff --git a/source3/po/tr.msg b/source3/po/tr.msg
index 2170d8bdf9735d9f1e7320752ec66713f8d7839b..04debc4378eb61467762e718395a15ead4881c74 100644 (file)
--- a/source3/po/tr.msg
+++ b/source3/po/tr.msg
@@ -3,7 +3,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
 #
 #   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
+#   the Free Software Foundation; either version 3 of the License, or

 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,

diff --git a/source3/python/setup.py b/source3/python/setup.py
index 1efe5938e11fdf5f8da4b7c7e1649af9eb8f64fb..c2896200a66f788e323c30301a3ad74239aa4810 100755 (executable)
--- a/source3/python/setup.py
+++ b/source3/python/setup.py
@@ -8,7 +8,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
 #
 # 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
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,

diff --git a/source3/script/gen-8bit-gap.sh.in b/source3/script/gen-8bit-gap.sh.in
index bcf64a4464f52f576d9cf5ce2b023208a8d32930..b3919a234cc28d8ea37652050694efe65a9b29d2 100755 (executable)
--- a/source3/script/gen-8bit-gap.sh.in
+++ b/source3/script/gen-8bit-gap.sh.in
@@ -15,7 +15,7 @@ echo " * and source/script/gen-8bit-gap.sh script "
 echo " * "
 echo " * This program is free software; you can redistribute it and/or modify "
 echo " * it under the terms of the GNU General Public License as published by "
 echo " * "
 echo " * This program is free software; you can redistribute it and/or modify "
 echo " * it under the terms of the GNU General Public License as published by "

-echo " * the Free Software Foundation; either version 2 of the License, or "
+echo " * the Free Software Foundation; either version 3 of the License, or "

 echo " * (at your option) any later version. "
 echo " *  "
 echo " * This program is distributed in the hope that it will be useful,"
 echo " * (at your option) any later version. "
 echo " *  "
 echo " * This program is distributed in the hope that it will be useful,"

diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk
index 20b20384a2655b6b6a3c1e4b2754db4949633b87..c8f252a34f1dcfdcdab586d03eccea80ad3ad384 100644 (file)
--- a/source3/script/mkbuildoptions.awk
+++ b/source3/script/mkbuildoptions.awk
@@ -7,7 +7,7 @@ BEGIN {
        print "   ";
        print "   This program is free software; you can redistribute it and/or modify";
        print "   it under the terms of the GNU General Public License as published by";
        print "   ";
        print "   This program is free software; you can redistribute it and/or modify";
        print "   it under the terms of the GNU General Public License as published by";

-       print "   the Free Software Foundation; either version 2 of the License, or";
+       print "   the Free Software Foundation; either version 3 of the License, or";

        print "   (at your option) any later version.";
        print "   ";
        print "   This program is distributed in the hope that it will be useful,";
        print "   (at your option) any later version.";
        print "   ";
        print "   This program is distributed in the hope that it will be useful,";

diff --git a/source3/script/tests/dlopen.sh b/source3/script/tests/dlopen.sh
index 61279536927c03cedf29ba429f5927848d01643e..dce95e876efb93ffa65105ecef6dbb80ce657e65 100755 (executable)
--- a/source3/script/tests/dlopen.sh
+++ b/source3/script/tests/dlopen.sh
@@ -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
 #
 # 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
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
index c8b3b28779dbb2ae15f29c41c5a121da0ec0ff0b..471aaab3151cf71b6bebcee5a4c15d1cc4e63e54 100644 (file)
--- a/testsuite/config/unix.exp
+++ b/testsuite/config/unix.exp
@@ -2,7 +2,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
 
 # 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
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,

diff --git a/testsuite/lib/compile.exp b/testsuite/lib/compile.exp
index 070498d95895403bcf27d83bf4276173ee0ff16b..8574c62bb502c15be329e02770a571ab7fbdae69 100644 (file)
--- a/testsuite/lib/compile.exp
+++ b/testsuite/lib/compile.exp
@@ -8,7 +8,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
 #   
 # 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
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,

diff --git a/testsuite/smbd/se_access_check.exp b/testsuite/smbd/se_access_check.exp
index cd84ab8ee08170e839fee06bb99aa7de5b04ed4f..74df6136b1704b24eda2e3a5e62298b7dcc6bd8f 100644 (file)
--- a/testsuite/smbd/se_access_check.exp
+++ b/testsuite/smbd/se_access_check.exp
@@ -8,7 +8,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
 #   
 # 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
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,

diff --git a/testsuite/smbd/sec_ctx.exp b/testsuite/smbd/sec_ctx.exp
index 0831400e702710881f62e784342b82e00dd7a006..b4ace839ed20b1b49cad0fd04112b1f2816409d2 100644 (file)
--- a/testsuite/smbd/sec_ctx.exp
+++ b/testsuite/smbd/sec_ctx.exp
@@ -8,7 +8,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
 #   
 # 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
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #   
 # This program is distributed in the hope that it will be useful,