Skip to content

Commit

Permalink
Correcting LICENSE.md.
Browse files Browse the repository at this point in the history
1.  Removing copyright information for code of conduct - that's in the main website.
2.  Crediting ownership of trademark to NumFOCUS.
  • Loading branch information
gvwilson committed Feb 12, 2015
1 parent 6aa67de commit f889e94
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ layout: page
root: .
title: Licenses
---
### Instructional Material
## Instructional Material

All Software Carpentry instructional material is made available under
the [Creative Commons Attribution license][cc-by-human]. The following
Expand Down Expand Up @@ -44,12 +44,12 @@ Notices:
rights such as publicity, privacy, or moral rights may limit how you
use the material.

### Software
## Software

Except where otherwise noted, the example programs and other software
provided by Software Carpentry are made available under the
[OSI](http://opensource.org)-approved
[MIT license](http://opensource.org/licenses/mit-license.html).
[OSI][osi]-approved
[MIT license][mit-license].

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand All @@ -70,16 +70,13 @@ 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.

### Other Material

Our [code of conduct](CODE_OF_CONDUCT.html) is taken from
[this site](https://github.com/Bantik/contributor_covenant/blob/master/LICENSE),
and is made available under the same MIT License as our software.

### Trademark
## Trademark

"Software Carpentry" and the Software Carpentry logo are registered
trademarks of the Software Carpentry Foundation.
trademarks of [NumFOCUS][numfocus].

[cc-by-human]: https://creativecommons.org/licenses/by/4.0/
[cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode
[mit-license]: http://opensource.org/licenses/mit-license.html
[numfocus]: http://numfocus.org/
[osi]: http://opensource.org

0 comments on commit f889e94

Please sign in to comment.