Tweaking the license text a bit more.

7 files changed, 21 insertions, 14 deletions

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