r23796: main COPYING file for samba4, plus some formatting varients

(This used to be commit 76c6bfdeb51b5673bbabe0ca3d8bff3b74a327ee)

11 files changed, 11 insertions, 11 deletions

diff --git a/source4/lib/json/aclocal.m4 b/source4/lib/json/aclocal.m4
index 9aa25a5437..f50e7e11ba 100644
--- a/source4/lib/json/aclocal.m4
+++ b/source4/lib/json/aclocal.m4
@@ -5181,7 +5181,7 @@ ifelse([$1], [],
 #
 # 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, but
diff --git a/source4/lib/json/configure b/source4/lib/json/configure
index 17360ff803..8ff98d887d 100755
--- a/source4/lib/json/configure
+++ b/source4/lib/json/configure
@@ -10154,7 +10154,7 @@ echo "$as_me: creating $ofile" >&6;}
 #
 # 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, but
diff --git a/source4/lib/json/ltmain.sh b/source4/lib/json/ltmain.sh
index 1a224ac2ae..3aae6cfb17 100644
--- a/source4/lib/json/ltmain.sh
+++ b/source4/lib/json/ltmain.sh
@@ -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 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
diff --git a/source4/lib/ldb/external/pkg.m4 b/source4/lib/ldb/external/pkg.m4
index c29b6c0577..53e59ae903 100644
--- a/source4/lib/ldb/external/pkg.m4
+++ b/source4/lib/ldb/external/pkg.m4
@@ -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 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
diff --git a/source4/lib/ldb/swig/Ldb.py b/source4/lib/ldb/swig/Ldb.py
index c7e6191c8a..8cc7663cc3 100644
--- a/source4/lib/ldb/swig/Ldb.py
+++ b/source4/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
-# 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,
diff --git a/source4/lib/replace/getpass.c b/source4/lib/replace/getpass.c
index 2ccbf7b733..2cbb30e2da 100644
--- a/source4/lib/replace/getpass.c
+++ b/source4/lib/replace/getpass.c
@@ -3,7 +3,7 @@ This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
+published by the Free Software Foundation; either version 3 of the
 License, or (at your option) any later version.
 
 The GNU C Library is distributed in the hope that it will be useful,
diff --git a/source4/lib/replace/strptime.c b/source4/lib/replace/strptime.c
index d415b7826e..2658a66854 100644
--- a/source4/lib/replace/strptime.c
+++ b/source4/lib/replace/strptime.c
@@ -5,7 +5,7 @@
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
+   published by the Free Software Foundation; either version 3 of the
    License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
diff --git a/source4/lib/talloc/talloc.3.xml b/source4/lib/talloc/talloc.3.xml
index 83ca67a495..ed7466c9ee 100644
--- a/source4/lib/talloc/talloc.3.xml
+++ b/source4/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
-      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>
diff --git a/source4/lib/tdb/swig/Tdb.py b/source4/lib/tdb/swig/Tdb.py
index aac7a90354..7225638817 100644
--- a/source4/lib/tdb/swig/Tdb.py
+++ b/source4/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
-# 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,
diff --git a/source4/lib/util/util_file.c b/source4/lib/util/util_file.c
index 3c44351c50..df4cb902f0 100644
--- a/source4/lib/util/util_file.c
+++ b/source4/lib/util/util_file.c
@@ -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 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
diff --git a/source4/param/secrets.h b/source4/param/secrets.h
index 8ef7ec5f78..b8e721e478 100644
--- a/source4/param/secrets.h
+++ b/source4/param/secrets.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 of the License, or (at your
+ * 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 WITHOUT