Apply ISC license clarification

  for f in `grep -rl 'and distribute' .`; do echo -e "%s;and distribute;and/or distribute;\nwq" | ed "$f"; done

More at: http://en.wikipedia.org/wiki/ISC_licence

diff --git a/COPYRIGHT b/COPYRIGHT
index c20f0b8bd81b100a0cfcd1bcb8eca90ce136df3f..740a5aea94adfc5735b2f51bf62c463a0295a737 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -2,7 +2,7 @@ SkyTools - tool collection for PostgreSQL
 
 Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
 
-Permission to use, copy, modify, and distribute this software for any
+Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
 copyright notice and this permission notice appear in all copies.
 

diff --git a/sql/pgq/lowlevel/insert_event.c b/sql/pgq/lowlevel/insert_event.c
index e55a18a6ec495fee2ff7c00cc314a5316d470fb0..3ac283e79d06521a1ec8c1cf684b53bc80ccb7c9 100644 (file)
--- a/sql/pgq/lowlevel/insert_event.c
+++ b/sql/pgq/lowlevel/insert_event.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/sql/pgq/triggers/common.c b/sql/pgq/triggers/common.c
index 883bbfa5785c74d431a7e7c0fae9c36065dabc18..880681b5689dd3775efa94ded3575c6158a10e00 100644 (file)
--- a/sql/pgq/triggers/common.c
+++ b/sql/pgq/triggers/common.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/sql/pgq/triggers/logtriga.c b/sql/pgq/triggers/logtriga.c
index 0b2e544b963070afc88e36dc68703aef08f379e4..4fe38c21f64badc5494579b554eaf8407d949e38 100644 (file)
--- a/sql/pgq/triggers/logtriga.c
+++ b/sql/pgq/triggers/logtriga.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/sql/pgq/triggers/logutriga.c b/sql/pgq/triggers/logutriga.c
index 37506aa7a0ade2ca5e6939a3deac9358e6482ebf..3503127418b80c2307a30fead994077cd958d309 100644 (file)
--- a/sql/pgq/triggers/logutriga.c
+++ b/sql/pgq/triggers/logutriga.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/sql/pgq/triggers/makesql.c b/sql/pgq/triggers/makesql.c
index e9b1ca852baedfce0f6e4ff794f155073c009410..53f5ef86e5eb174d6fa9f4798afaab1e75ea4e8c 100644 (file)
--- a/sql/pgq/triggers/makesql.c
+++ b/sql/pgq/triggers/makesql.c
@@ -8,7 +8,7 @@
  *   Copyright (c) 2003-2006, PostgreSQL Global Development Group
  *      Author: Jan Wieck, Afilias USA INC.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/sql/pgq/triggers/sqltriga.c b/sql/pgq/triggers/sqltriga.c
index 3ccfb50a5ed7e4efa0c31fdf8610dc54510fdc84..00f545f81a75c717dde4f7b7695944f3463b9b2d 100644 (file)
--- a/sql/pgq/triggers/sqltriga.c
+++ b/sql/pgq/triggers/sqltriga.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

diff --git a/sql/pgq/triggers/stringutil.c b/sql/pgq/triggers/stringutil.c
index ebd5b09829b3e274fd118948bd33649eb08ea144..230567bc7658548e99371fdd1f629c8427ee96e7 100644 (file)
--- a/sql/pgq/triggers/stringutil.c
+++ b/sql/pgq/triggers/stringutil.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2007 Marko Kreen, Skype Technologies OÜ
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *