summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2007-07-10 13:55:49 +0000
committerWayne Davison <wayned@samba.org>2007-07-10 13:55:49 +0000
commit8e41b68e8f975c02a5d9281be780ba5d1a385107 (patch)
tree4cdbe7cc7f636f0b42e07ca7f82b7c1c94dde2d1
parentdc77edf2181a08ded466e8fc44b190c90b313c0d (diff)
downloadrsync-8e41b68e8f975c02a5d9281be780ba5d1a385107.tar.gz
rsync-8e41b68e8f975c02a5d9281be780ba5d1a385107.tar.bz2
rsync-8e41b68e8f975c02a5d9281be780ba5d1a385107.zip
Tweaking the license text a bit more.
-rw-r--r--access.c5
-rw-r--r--acls.c5
-rw-r--r--authenticate.c5
-rw-r--r--backup.c5
-rw-r--r--batch.c5
-rw-r--r--byteorder.h5
-rw-r--r--case_N.h5
-rw-r--r--checksum.c5
-rw-r--r--chmod.c5
-rw-r--r--cleanup.c5
-rw-r--r--clientname.c5
-rw-r--r--clientserver.c5
-rw-r--r--compat.c5
-rw-r--r--connection.c5
-rw-r--r--errcode.h5
-rw-r--r--exclude.c5
-rw-r--r--fileio.c5
-rw-r--r--flist.c5
-rw-r--r--generator.c5
-rw-r--r--hlink.c5
-rw-r--r--io.c5
-rw-r--r--io.h5
-rw-r--r--lib/compat.c5
-rw-r--r--lib/md5.c5
-rw-r--r--lib/mdfour.c5
-rw-r--r--lib/permstring.c5
-rw-r--r--lib/sysacls.c5
-rw-r--r--lib/sysacls.h5
-rw-r--r--lib/sysxattrs.c5
-rw-r--r--loadparm.c5
-rw-r--r--log.c5
-rw-r--r--main.c5
-rw-r--r--match.c5
-rw-r--r--mkrounding.c5
-rw-r--r--options.c5
-rw-r--r--params.c5
-rw-r--r--pipe.c5
-rw-r--r--progress.c5
-rw-r--r--receiver.c5
-rw-r--r--rsync.c5
-rw-r--r--rsync.h5
-rw-r--r--sender.c5
-rw-r--r--socket.c5
-rw-r--r--syscall.c5
-rw-r--r--t_stub.c5
-rw-r--r--t_unsafe.c5
-rw-r--r--tls.c5
-rw-r--r--token.c5
-rw-r--r--trimslash.c5
-rw-r--r--uidlist.c5
-rw-r--r--util.c5
-rw-r--r--wildtest.c5
-rw-r--r--xattrs.c5
53 files changed, 159 insertions, 106 deletions
diff --git a/access.c b/access.c
index 0dd8cb77..48d79d2f 100644
--- 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 6074d9ba..658c4996 100644
--- 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 e1591ea8..484cebe0 100644
--- 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 aacac8c3..05856aa2 100644
--- 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 7c295631..5b88b80f 100644
--- 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 32d27152..7debba5c 100644
--- 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 afb74f1d..5fcce1f9 100644
--- 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 3354b333..51a5293a 100644
--- 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 2015f5d0..ce9e295b 100644
--- 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 76f44e2d..d35d77af 100644
--- 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 d32b9d35..9efecbce 100644
--- 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 44baa6ad..6d1da3e8 100644
--- 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 b8fde106..c90e2f71 100644
--- 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 d26a70aa..2bb0ae2e 100644
--- 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 5076c923..c5259d41 100644
--- 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 50d31063..1a0be70f 100644
--- 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 5879768b..d97cdac7 100644
--- 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 e4731e5e..e33cd585 100644
--- 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 0dda9f41..1064ff58 100644
--- 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 b89b4d27..e9e76cdb 100644
--- 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 be19b2c5..0ab9f57b 100644
--- 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 775cfdb9..6ce4e10c 100644
--- 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 b26a879c..e0cb9f95 100644
--- 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 ff50cdfb..2c5b9014 100644
--- 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 c8e7624e..3889be6b 100644
--- 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 51dc2785..2ce1e7f4 100644
--- 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 699a1659..27d1b271 100644
--- 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 b8b7f117..d22f995b 100644
--- 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 babe09ed..ddcd42af 100644
--- 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 b14d09d4..b7974bcf 100644
--- 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 ad0d00b5..06b5ae37 100644
--- 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 9990be81..d30350d1 100644
--- 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 3a663075..fdecf4bf 100644
--- 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 939cb44a..d978d4bb 100644
--- 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 1a110e11..a700b224 100644
--- 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 62524581..883860e0 100644
--- 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 696899f0..4508478c 100644
--- 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 430b1442..73ad8389 100644
--- 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 a1486b1f..98666487 100644
--- 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 1ae33684..4fcdea1d 100644
--- 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 82c81335..f08806c0 100644
--- 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 397e1c8a..e9c48da9 100644
--- 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 a61bf638..f0b1318a 100644
--- 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 58daad1d..faa75c28 100644
--- 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 16a6dac2..59d17d82 100644
--- 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 f10e550c..5c989ed2 100644
--- 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 6e1c88c7..cadacdc6 100644
--- 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 d85bf11a..7510b99f 100644
--- 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 5f844836..2188dc33 100644
--- 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 97e9c233..7477f36d 100644
--- 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 9fa0b8ca..656c3bf5 100644
--- 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 7e4838c4..5466f1e0 100644
--- 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 15f5b5e8..595ec422 100644
--- 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