Unverified Commit 2a9f189d authored by François Michonneau's avatar François Michonneau
Browse files

update text in License to reflect new trademarks

parent 25a5b9f8

LICENSE.md

+11 −9
Original line number Diff line number Diff line
@@ -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
@@ -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