From 49c67a01ef0ff74346ceda5eafa1eb6016a2202f Mon Sep 17 00:00:00 2001 From: Pixelcode <52963327+realpixelcode@users.noreply.github.com> Date: Mon, 25 Jul 2022 22:38:23 +0000 Subject: [PATCH 1/4] clarify section 5.5 --- licenses/Apache-2.0-NoHarm.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/licenses/Apache-2.0-NoHarm.md b/licenses/Apache-2.0-NoHarm.md index 31948f7..a4ba8b3 100644 --- a/licenses/Apache-2.0-NoHarm.md +++ b/licenses/Apache-2.0-NoHarm.md @@ -116,8 +116,8 @@ conditions: 4. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission; and -5. This software must not be used by any organisation, website, product, or service that: - 1. promotes, lobbies for or derives a majority of income from: +5. This software must not be used by any person, organisation or other legal entity, or any website, product or service that: + 1. commits, promotes, lobbies for or derives a majority of income from: 1. **abuses of human rights**: * human trafficking * sex trafficking @@ -139,15 +139,13 @@ conditions: * tobacco * products that encourage adversely addictive behaviours - 2. dissuades, lobbies against, or derives a majority of income from actions that discourage or frustrate: + 2. dissuades, lobbies against, or commits or derives a majority of income from actions that discourage or frustrate: * peace * access to the rights set out in the [Universal Declaration of Human Rights](./documents/UDHR.md) and the [Convention on the Rights of the Child](./documents/CRC.md) * peaceful assembly and association (including worker associations) * a sustainable environment * democratic processes - ; and - 6. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the From 8933a5790dd9ee9557d77aaa6d9f8860106f2230 Mon Sep 17 00:00:00 2001 From: Pixelcode <52963327+realpixelcode@users.noreply.github.com> Date: Tue, 26 Jul 2022 11:49:28 +0000 Subject: [PATCH 2/4] clarify section 5.5 in LICENSE.md --- LICENSE.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 26f6b06..e414f44 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -110,7 +110,7 @@ conditions: 4. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission; and -5. This software must not be used by any organisation, website, product, or service that: +5. This software must not be used by any person, organisation or other legal entity, or any website, product or service that: 1. promotes, lobbies for or derives a majority of income from: 1. **abuses of human rights**: * human trafficking @@ -139,7 +139,6 @@ conditions: * democratic processes * peaceful assembly and association (including worker associations) * a sustainable environment - ; and 5. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained From 5dd452cd207d6dbc773f09b0393ec626d4c9ece7 Mon Sep 17 00:00:00 2001 From: Pixelcode <52963327+realpixelcode@users.noreply.github.com> Date: Tue, 26 Jul 2022 14:02:47 +0000 Subject: [PATCH 3/4] re-add "and" to section 5.5 --- LICENSE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index e414f44..fe70ea5 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -138,9 +138,9 @@ conditions: * access to the rights set out in the [Universal Declaration of Human Rights](./documents/UDHR.md) and the [Convention on the Rights of the Child](./documents/CRC.md) * democratic processes * peaceful assembly and association (including worker associations) - * a sustainable environment + * a sustainable environment; and -5. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative +6. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file From 9e22262ed2583f890c5530781dd86167135895ba Mon Sep 17 00:00:00 2001 From: Pixelcode <52963327+realpixelcode@users.noreply.github.com> Date: Tue, 26 Jul 2022 14:05:41 +0000 Subject: [PATCH 4/4] re-add "and" to section 5.5 --- licenses/Apache-2.0-NoHarm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/Apache-2.0-NoHarm.md b/licenses/Apache-2.0-NoHarm.md index a4ba8b3..2fb7cc0 100644 --- a/licenses/Apache-2.0-NoHarm.md +++ b/licenses/Apache-2.0-NoHarm.md @@ -144,7 +144,7 @@ conditions: * access to the rights set out in the [Universal Declaration of Human Rights](./documents/UDHR.md) and the [Convention on the Rights of the Child](./documents/CRC.md) * peaceful assembly and association (including worker associations) * a sustainable environment - * democratic processes + * democratic processes; and 6. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained