From 77703679150d4598b77e735015668005c10e5a45 Mon Sep 17 00:00:00 2001 From: Andree Valle Date: Mon, 23 Oct 2023 19:37:56 +0100 Subject: [PATCH 1/4] replace sections of the license file template --- LICENSE.md | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 7632871f..3a1bb8d8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -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. + +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 @@ -23,7 +25,7 @@ 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 + is derived from work that is Copyright (c) Epiverse-TRACE, where practical, linking to ), 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 @@ -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 @@ -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 From fd29e97669505d48e99d0c662b66ee80015cfeb2 Mon Sep 17 00:00:00 2001 From: Andree Valle Date: Mon, 23 Oct 2023 19:37:56 +0100 Subject: [PATCH 2/4] fix #8 replace sections of license file --- LICENSE.md | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 7632871f..3a1bb8d8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -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. + +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 @@ -23,7 +25,7 @@ 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 + is derived from work that is Copyright (c) Epiverse-TRACE, where practical, linking to ), 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 @@ -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 @@ -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 From 347616fe326a61c349614a133f7d840c45ed1c7a Mon Sep 17 00:00:00 2001 From: Andree Valle Date: Mon, 23 Oct 2023 19:44:31 +0100 Subject: [PATCH 3/4] replace website link --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 3a1bb8d8..c47a8431 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -26,7 +26,7 @@ Under the following terms: - **Attribution**---You must give appropriate credit (mentioning that your work is derived from work that is Copyright (c) Epiverse-TRACE, where - practical, linking to ), provide a [link to the + practical, linking to ), 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. From 87160b575ff9e2daa5e9410222c96bcbfaddeceb Mon Sep 17 00:00:00 2001 From: Andree Valle Date: Tue, 24 Oct 2023 09:52:03 +0100 Subject: [PATCH 4/4] fix intro sentence for a based development --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index c47a8431..49a8cbdd 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -4,7 +4,7 @@ title: "Licenses" ## Instructional Material -This work is a derivative from Copyright (c) The Carpentries, and developed by Epiverse-TRACE. +The tutorials in this repository are developed by Epiverse-TRACE, based on the [lesson template from the Carpentries](https://github.com/carpentries/workbench-template-rmd) (template under CC BY license). All Epiverse-TRACE instructional material is made available under the [Creative Commons