Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Apache 2.0 redistribution wording. #61

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions licenses/Apache-2.0-NoHarm.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,17 @@ You may reproduce and distribute copies of the Work or Derivative Works thereof
or without modifications, and in Source or Object form, provided that You meet the following
conditions:

1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
1. You must give any other recipients of the Work or Derivative Works a copy of this License.

2. You must cause any modified files to carry prominent notices stating that You changed the
files; and
files.

3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright,
patent, trademark, and attribution notices from the Source form of the Work, excluding those
notices that do not pertain to any part of the Derivative Works; and
notices that do not pertain to any part of the Derivative Works.

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
or promote products derived from this software without specific prior written permission.

5. This software must not be used by any organisation, website, product, or service that:
1. lobbies for, promotes, or derives a majority of income from actions that support or contribute
Expand All @@ -133,16 +133,17 @@ conditions:
* violence (except when required to protect public safety)
* burning of forests
* deforestation
* hate speech or discrimination based on age, gender, gender identity, race, sexuality, religion, nationality
* hate speech or discrimination based on age, gender, gender identity, race, sexuality,
religion, nationality

2. lobbies against, 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 and the Convention on the Rights of the Child
* access to the rights set out in the Universal Declaration of Human Rights and the Convention
on the Rights of the Child
* peaceful assembly and association (including worker associations)
* a safe environment or action to curtail the use of fossil fuels or prevent climate change
* democratic processes

; 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
within such NOTICE file, excluding those notices that do not pertain to any part of the
Expand Down