Skip to content

Commit c2e0d55

Browse files
authored
Update LICENSE.md
1 parent 7ec5cf9 commit c2e0d55

File tree

1 file changed

+18
-27
lines changed

1 file changed

+18
-27
lines changed

LICENSE.md

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ permalink: /license/
55
---
66
## Instructional Material
77

8-
All Software Carpentry and Data Carpentry instructional material is
9-
made available under the [Creative Commons Attribution
8+
This material is derived from a framework created by the Software Carpentry
9+
and Data Carpentry projects under the [Creative Commons Attribution
10+
license][cc-by-human].
11+
12+
All Common Workflow Language project instructional material and changes
13+
to the structure are also made available under the [Creative Commons Attribution
1014
license][cc-by-human]. The following is a human-readable summary of
1115
(and not a substitute for) the [full legal text of the CC BY 4.0
1216
license][cc-by-legal].
@@ -24,9 +28,9 @@ license terms.
2428
Under the following terms:
2529

2630
* **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
31+
your work is derived from work that is Copyright © the Common Workflow
32+
Language project, and Copyright © Software Carpentry, and, where practical, linking to
33+
http://www.commonwl.org/ and http://software-carpentry.org/), provide a [link to the
3034
license][cc-by-human], and indicate if changes were made. You may do
3135
so in any reasonable manner, but not in any way that suggests the
3236
licensor endorses you or your use.
@@ -48,28 +52,15 @@ Notices:
4852
## Software
4953

5054
Except where otherwise noted, the example programs and other software
51-
provided by Software Carpentry and Data Carpentry are made available under the
55+
provided by Common Workflow Language project are made available under the
5256
[OSI][osi]-approved
53-
[MIT license][mit-license].
54-
55-
Permission is hereby granted, free of charge, to any person obtaining
56-
a copy of this software and associated documentation files (the
57-
"Software"), to deal in the Software without restriction, including
58-
without limitation the rights to use, copy, modify, merge, publish,
59-
distribute, sublicense, and/or sell copies of the Software, and to
60-
permit persons to whom the Software is furnished to do so, subject to
61-
the following conditions:
62-
63-
The above copyright notice and this permission notice shall be
64-
included in all copies or substantial portions of the Software.
65-
66-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
67-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
68-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
69-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
70-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
71-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
72-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
57+
[Apache 2.0 license][apache-2.0-license].
58+
59+
Unless required by applicable law or agreed to in writing, software
60+
distributed under the License is distributed on an "AS IS" BASIS,
61+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
62+
See the License for the specific language governing permissions and
63+
limitations under the License.
7364

7465
## Trademark
7566

@@ -78,6 +69,6 @@ are registered trademarks of [NumFOCUS][numfocus].
7869

7970
[cc-by-human]: https://creativecommons.org/licenses/by/4.0/
8071
[cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode
81-
[mit-license]: http://opensource.org/licenses/mit-license.html
72+
[apache-2.0-license]: https://opensource.org/licenses/Apache-2.0
8273
[numfocus]: http://numfocus.org/
8374
[osi]: http://opensource.org

0 commit comments

Comments
 (0)