Verified Commit e9487575 authored by Toby Hodges's avatar Toby Hodges Committed by Renato Alves
Browse files

Update LICENSE.md

parent d9348f6a
......@@ -5,7 +5,7 @@ root: .
---
## Instructional Material
All Software Carpentry, Data Carpentry, and Library Carpentry instructional material is
This 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
......@@ -24,10 +24,11 @@ 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
your work is derived from work that is
Copyright © European Molecular Biology Laboratory
and, where practical, linking to
http://bio-it.embl.de/), 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.
......@@ -48,7 +49,7 @@ Notices:
## Software
Except where otherwise noted, the example programs and other software
provided by Software Carpentry and Data Carpentry are made available under the
provided in this lesson are made available under the
[OSI][osi]-approved
[MIT license][mit-license].
......@@ -71,11 +72,6 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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
"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
[mit-license]: https://opensource.org/licenses/mit-license.html
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment