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.

Sign up for GitHub

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

replace sections of license file #38

Merged
merged 5 commits into from
Oct 24, 2023
Merged

replace sections of license file #38

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7770367
replace sections of the license file template
avallecam Oct 23, 2023
fd29e97
fix #8 replace sections of license file
avallecam Oct 23, 2023
b4c1d14
Merge branch 'dev/license' of https://github.com/epiverse-trace/tutor…
avallecam Oct 23, 2023
347616f
replace website link
avallecam Oct 23, 2023
87160b5
fix intro sentence for a based development
avallecam Oct 24, 2023
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
17 changes: 6 additions & 11 deletions LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ title: "Licenses"

## Instructional Material

All Carpentries (Software Carpentry, Data Carpentry, and Library Carpentry)
This work is a derivative from Copyright (c) The Carpentries, and developed by Epiverse-TRACE.
avallecam marked this conversation as resolved.
Show resolved Hide resolved

All Epiverse-TRACE
instructional material is made available under the [Creative Commons
Attribution license][cc-by-human]. The following is a human-readable summary of
(and not a substitute for) the [full legal text of the CC BY 4.0
Expand All @@ -23,8 +25,8 @@ terms.
Under the following terms:

- **Attribution**---You must give appropriate credit (mentioning that your work
is derived from work that is Copyright (c) The Carpentries and, where
practical, linking to <https://carpentries.org/>), provide a [link to the
is derived from work that is Copyright (c) Epiverse-TRACE, where
practical, linking to <https://epiverse-trace.github.io/>), 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.
Expand All @@ -45,7 +47,7 @@ Notices:
## Software

Except where otherwise noted, the example programs and other software provided
by The Carpentries are made available under the [OSI][osi]-approved [MIT
by Epiverse-TRACE are made available under the [OSI][osi]-approved [MIT
license][mit-license].

Permission is hereby granted, free of charge, to any person obtaining a copy of
Expand All @@ -66,14 +68,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

## Trademark

"The Carpentries", "Software Carpentry", "Data Carpentry", and "Library
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
[mit-license]: https://opensource.org/licenses/mit-license.html
[ci]: https://communityin.org/
[osi]: https://opensource.org