Skip to content

Commit 2a9f189

Browse files
committed
update text in License to reflect new trademarks
1 parent 25a5b9f commit 2a9f189

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

LICENSE.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ license terms.
2323

2424
Under the following terms:
2525

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

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

7476
## Trademark
7577

76-
"Software Carpentry" and "Data Carpentry" and their respective logos
77-
are registered trademarks of [Community Initiatives][CI].
78+
"The Carpentries", "Software Carpentry" and "Data Carpentry" and their respective logos are
79+
registered trademarks of [Community Initiatives][CI].
7880

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

0 commit comments

Comments
 (0)