Tweaking the license text a bit more.

diff --git a/access.c b/access.c
index 0dd8cb772aa81d11a2e13e4f918bb536388a5372..48d79d2ff4904e7a8abf892b011dedbafb856db1 100644 (file)
--- a/access.c
+++ b/access.c
@@ -5,8 +5,9 @@
  * Copyright (C) 2004-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/acls.c b/acls.c
index 6074d9baa47a0629bd4ab95eb3547ba6243b4cf1..658c4996e63a88a11ff4974276a17b35b0eb3670 100644 (file)
--- a/acls.c
+++ b/acls.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2006 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/authenticate.c b/authenticate.c
index e1591ea8c75c258a68d2a8cea90ab24b871fdf11..484cebe089cb30db6c3df2508b8dc3b6bfabf98b 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -5,8 +5,9 @@
  * Copyright (C) 2002-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/backup.c b/backup.c
index aacac8c398de662446d0760dd25179573da2598c..05856aa2db52798807247f373ae2b6949e830d57 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -5,8 +5,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/batch.c b/batch.c
index 7c29563184f85b0c75f104e922913141072c9ca3..5b88b80f73ca43a1a5f0d0e370f347ae822b50f1 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2004-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/byteorder.h b/byteorder.h
index 32d2715245dd7ea3dbfc5aee2cb9c68082d93a66..7debba5c05a9a27cbce66d98afe04c4d1c7b3f6e 100644 (file)
--- a/byteorder.h
+++ b/byteorder.h
@@ -5,8 +5,9 @@
  * Copyright (C) 2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/case_N.h b/case_N.h
index afb74f1dae6d2cd3ffe50120b1ef16a1389e9d45..5fcce1f93dc0d49a1b2a1930def2f008ef8bef58 100644 (file)
--- a/case_N.h
+++ b/case_N.h
@@ -4,8 +4,9 @@
  * Copyright (C) 2006-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/checksum.c b/checksum.c
index 3354b33375e3a281e6307a3bf1a2abb20dd9e20d..51a5293a5a37be85234775ed2c5e5a92bce77b78 100644 (file)
--- a/checksum.c
+++ b/checksum.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2004-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/chmod.c b/chmod.c
index 2015f5d0e01702fb9f870ca1a53da0c40387a2ba..ce9e295b03f6442c516d03ef1943374af7086d85 100644 (file)
--- a/chmod.c
+++ b/chmod.c
@@ -5,8 +5,9 @@
  * Copyright (C) 2005-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/cleanup.c b/cleanup.c
index 76f44e2d486440c87f18aa83cd8906f8cb95ab48..d35d77af7bd49e83ea4dd5aa4f0a87da75fad07a 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/clientname.c b/clientname.c
index d32b9d352d3c1f479486952fc1b16d6229b86520..9efecbcea0390ba7484ffad4f57deb8023e1f140 100644 (file)
--- a/clientname.c
+++ b/clientname.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2002-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/clientserver.c b/clientserver.c
index 44baa6addbe63246c2c14a5f6b6161256538e907..6d1da3e8018b9fa142764e5f36ac8af792013e71 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2002-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/compat.c b/compat.c
index b8fde1061ac05e19206db53d6c20701e6e8adb9a..c90e2f71e9cfd0ebb189b5de48d873af9889e48e 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2004-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/connection.c b/connection.c
index d26a70aaca4a2fcc3031e81c6ecca7e1bf0e535d..2bb0ae2ee02d19ac2f241fff544883402553958c 100644 (file)
--- a/connection.c
+++ b/connection.c
@@ -4,8 +4,9 @@
  * Copyright (C) 1998 Andrew Tridgell
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/errcode.h b/errcode.h
index 5076c9237f76c497003f974ae1565902c73e16b7..c5259d41824db842848867ff962b9f6b5a5260df 100644 (file)
--- a/errcode.h
+++ b/errcode.h
@@ -5,8 +5,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/exclude.c b/exclude.c
index 50d31063b8f36e702f19bfbb18155087142f4100..1a0be70f5f6579104cc96e233d3dbf74d40a58a6 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/fileio.c b/fileio.c
index 5879768b1740b789ff1a34a775dd8341fe484389..d97cdac72a4892725e162b52cfccdd469e2f2461 100644 (file)
--- a/fileio.c
+++ b/fileio.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2004-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/flist.c b/flist.c
index e4731e5eed4371b6ec0108a2c09e942ac0ed994f..e33cd5859072fb07ac1d93fc9fbfe2f9972a2c8a 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2002-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/generator.c b/generator.c
index 0dda9f41315c3d827dcdcb99b3f0b588a0b914b0..1064ff583892f0fe97e4536bf4c1ba77751df3b3 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/hlink.c b/hlink.c
index b89b4d27c36ddc9455d5903c54df64d85f446a67..e9e76cdb5a7df47173ea491fa3bb013df6676f75 100644 (file)
--- a/hlink.c
+++ b/hlink.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2004-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/io.c b/io.c
index be19b2c5e07cf44bd947a152c9ac4d9277bb3681..0ab9f57b8181d843edb713daf96ec7eae4a98e37 100644 (file)
--- a/io.c
+++ b/io.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/io.h b/io.h
index 775cfdb9d686867f7d7509833b80580558311e2b..6ce4e10c736dc328aaa6fa90637ad9771cf03b1a 100644 (file)
--- a/io.h
+++ b/io.h
@@ -2,8 +2,9 @@
  * Copyright (C) 2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/lib/compat.c b/lib/compat.c
index b26a879c3ed6f1f7284b78596130006372a16e41..e0cb9f952065276d3e14d9dedad66f57ae15905b 100644 (file)
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2004, 2005, 2006 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/lib/md5.c b/lib/md5.c
index ff50cdfbfab1cf503c81053ff846eda19927e77f..2c5b9014b4ef863a906c3fc18106c077ae5d739b 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -4,8 +4,9 @@
  * Copyright (C) 2001-2003 Christophe Devine
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/lib/mdfour.c b/lib/mdfour.c
index c8e7624e3d42dd23c7737f15247804692c63dae4..3889be6b67c8a9eb7c85f72ebdd53e3d81bdaffa 100644 (file)
--- a/lib/mdfour.c
+++ b/lib/mdfour.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2005-2007 Wayne Davison
  * 
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/lib/permstring.c b/lib/permstring.c
index 51dc2785db378855179485205b26b6b1349e1a12..2ce1e7f4fb69c3dc18d152affb6b92c3121c9926 100644 (file)
--- a/lib/permstring.c
+++ b/lib/permstring.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003, 2006 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/lib/sysacls.c b/lib/sysacls.c
index 699a1659f95404b5c73a6b024ed0eb1a679ba5b9..27d1b27197c68ad2ee527b8076fe1ae5d921691d 100644 (file)
--- a/lib/sysacls.c
+++ b/lib/sysacls.c
@@ -7,8 +7,9 @@
  * one call.  Some functions that rsync doesn't need were also removed.
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/lib/sysacls.h b/lib/sysacls.h
index b8b7f117e0b5bc3b633e76faeafb51a336c04e6b..d22f995b9a7a85a5b172a827485215f6df7ddcaf 100644 (file)
--- a/lib/sysacls.h
+++ b/lib/sysacls.h
@@ -5,8 +5,9 @@
  * Copyright (C) Jeremy Allison 2000
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/lib/sysxattrs.c b/lib/sysxattrs.c
index babe09ed2032f9b9c957e22a17ffdcd60fc43d86..ddcd42afb71e2cfc7fb3dcd06b6c721d184fafa0 100644 (file)
--- a/lib/sysxattrs.c
+++ b/lib/sysxattrs.c
@@ -5,8 +5,9 @@
  * Written by Jay Fenlason.
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/loadparm.c b/loadparm.c
index b14d09d42ff130d20406986ca35f64bafccaa677..b7974bcf7804dc7adb0bb6a97a28b7482021d840 100644 (file)
--- a/loadparm.c
+++ b/loadparm.c
@@ -3,8 +3,9 @@
 
 /*
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/log.c b/log.c
index ad0d00b54c1f7d8cf67d3eb095974e8154b605d1..06b5ae370218ecf5fa8f8e6d6162cb77aefd2445 100644 (file)
--- a/log.c
+++ b/log.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/main.c b/main.c
index 9990be81d71ff20a63d76bde458ba7e85d292f09..d30350d1b1ef590b04e1771e58d3d91e2c72fafe 100644 (file)
--- a/main.c
+++ b/main.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/match.c b/match.c
index 3a663075fd33da66c89233adda157db850496056..fdecf4bf0bb82855cb219a5bfe0625581963dcb0 100644 (file)
--- a/match.c
+++ b/match.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/mkrounding.c b/mkrounding.c
index 939cb44a07a98580cfe343cadd6f097c8aa033c6..d978d4bb949f27325adc52d47c59faed07db4654 100644 (file)
--- a/mkrounding.c
+++ b/mkrounding.c
@@ -4,8 +4,9 @@
  * Copyright (C) 2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/options.c b/options.c
index 1a110e1122e4b4000107a1e1b64b0e50ee923a60..a700b22442cc9ecb1c284eeadc201df1bc1eb482 100644 (file)
--- a/options.c
+++ b/options.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2002-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/params.c b/params.c
index 625245813f2996569d0f1ee4f81fa3f08d43df8c..883860e0e1b7c44868bd0b6cc417a45a250236bb 100644 (file)
--- a/params.c
+++ b/params.c
@@ -3,8 +3,9 @@
 
 /*
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pipe.c b/pipe.c
index 696899f0af08ce3b3a71093ecd76355f3775ce04..4508478c6f8613671d468600b64f35eb4b195b0c 100644 (file)
--- a/pipe.c
+++ b/pipe.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2004-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/progress.c b/progress.c
index 430b144219ba9e6a95a189e926401c216795f74a..73ad83891a4027e878a5901023146d53f6c1aa2d 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/receiver.c b/receiver.c
index a1486b1fcdaf985d420b62e3ab7161dc7c64aca3..98666487ab4e9fdc24b4d005c38050e8c4628d80 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/rsync.c b/rsync.c
index 1ae33684358cf6c40350fc668fe610341c8985b4..4fcdea1daf8d6a7dca3bbb8ed1ae41742ddb7077 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/rsync.h b/rsync.h
index 82c81335dbc1284f1f19bb217aa6424cf4fb1007..f08806c0869fe5a71af288a93bcf2c2134ad143c 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -5,8 +5,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/sender.c b/sender.c
index 397e1c8a19ad5c1c91d17f1b2696f757e2f9bfa9..e9c48da90d28bee9cacea5f8df4a5ce231e0f5b8 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/socket.c b/socket.c
index a61bf6383888380fd69db77c40c4b7572df07128..f0b1318af7fef3fe47e4c75669949a2819e67787 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/syscall.c b/syscall.c
index 58daad1d24f6dac95c1d43bccf18abd520096df6..faa75c287d11b26016c4a4baa03023e3186aa298 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/t_stub.c b/t_stub.c
index 16a6dac20c60b9cbe42bb76219e3f84846978a92..59d17d82557e749a38ecc1bb887984f124046dde 100644 (file)
--- a/t_stub.c
+++ b/t_stub.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/t_unsafe.c b/t_unsafe.c
index f10e550ce1f5d9f4ed8a859af35f8ce33d5137c7..5c989ed2df77055b9be7d7b64061dd766e4fae7b 100644 (file)
--- a/t_unsafe.c
+++ b/t_unsafe.c
@@ -5,8 +5,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/tls.c b/tls.c
index 6e1c88c7dbfa24513362963582fd4ce02af159e3..cadacdc675bd1b3a78a25d23a25e5b7b750094fe 100644 (file)
--- a/tls.c
+++ b/tls.c
@@ -5,8 +5,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/token.c b/token.c
index d85bf11aaa3ac978b7f776e14ae15d888b6b7186..7510b99f70162285beff29c645304fe7aa7a5a2a 100644 (file)
--- a/token.c
+++ b/token.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/trimslash.c b/trimslash.c
index 5f8448364ebeca12b70eb90e8c43c0d4c9d8d385..2188dc33dda62cd6ecc9c960690e1325cf9e0dda 100644 (file)
--- a/trimslash.c
+++ b/trimslash.c
@@ -5,8 +5,9 @@
  * Copyright (C) 2003 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/uidlist.c b/uidlist.c
index 97e9c2339bb7fd62f6f739a4f8564b5aeffda782..7477f36d78ff844133af8e96e056cd921ef8019f 100644 (file)
--- a/uidlist.c
+++ b/uidlist.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2004-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/util.c b/util.c
index 9fa0b8cac81cad1384ddf9191097b64f1cf7018a..656c3bf5e4db78da145db3bbf2db0836c1ad4b46 100644 (file)
--- a/util.c
+++ b/util.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/wildtest.c b/wildtest.c
index 7e4838c4af6cc7440bb079e845447b255d25690b..5466f1e0f7dfbf8e2ddf2827c84bd1f61b0c0900 100644 (file)
--- a/wildtest.c
+++ b/wildtest.c
@@ -4,8 +4,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/xattrs.c b/xattrs.c
index 15f5b5e8a4b051a85c9037c4347237ddacdb89a3..595ec422417d61ee4ed1f3619de47d1e8bd02847 100644 (file)
--- a/xattrs.c
+++ b/xattrs.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2006, 2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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 WITHOUT ANY WARRANTY; without even the implied warranty of