Skip to content

Commit

Permalink
update text in License to reflect new trademarks
Browse files Browse the repository at this point in the history
  • Loading branch information
fmichonneau committed Oct 6, 2021
1 parent 25a5b9f commit 2a9f189
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ license terms.

Under the following terms:

* **Attribution**---You must give appropriate credit (mentioning that
your work is derived from work that is Copyright © Software
Carpentry and, where practical, linking to
http://software-carpentry.org/), provide a [link to the
license][cc-by-human], and indicate if changes were made. You may do
so in any reasonable manner, but not in any way that suggests the
licensor endorses you or your use.
* **Attribution**---You must give appropriate credit by:
- mentioning that your work is derived from work that is
Copyright © Software Carpentry, Data Carpentry, Library Carpentry,
or The Carpentries.
- where practical, linking to the respective lesson program website
(https://software-carpentry.org/, https://datacarpentry.org, https://librarycarpentry.org, or
https://carpentries.org), provide a [link to the license][cc-by-human]
- and indicate if changes were made. You may do so in any reasonable manner, but not in any way
that suggests the licensor endorses you or your use.

**No additional restrictions**---You may not apply legal terms or
technological measures that legally restrict others from doing
Expand Down Expand Up @@ -73,8 +75,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

## Trademark

"Software Carpentry" and "Data Carpentry" and their respective logos
are registered trademarks of [Community Initiatives][CI].
"The Carpentries", "Software Carpentry" and "Data Carpentry" and their respective logos are
registered trademarks of [Community Initiatives][CI].

[cc-by-human]: https://creativecommons.org/licenses/by/4.0/
[cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode
Expand Down

0 comments on commit 2a9f189

Please sign in to comment.