Skip to content

Commit a6c1c58

Browse files
author
arm61
committed
sorting the license out once and for all
1 parent 5bd9bd0 commit a6c1c58

5 files changed

Lines changed: 9 additions & 35 deletions

File tree

LICENSE

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,3 @@
1-
License for the open education resource.
2-
3-
MIT License
4-
5-
Copyright (c) 2018 Andrew R. McCluskey, James Grant, Adam R. Symington, Tim Snow, James Doutch, Benjamin J. Morgan, Stephen C. Parker, & Karen J. Edler
6-
7-
Permission is hereby granted, free of charge, to any person obtaining a copy
8-
of this software and associated documentation files (the "Software"), to deal
9-
in the Software without restriction, including without limitation the rights
10-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11-
copies of the Software, and to permit persons to whom the Software is
12-
furnished to do so, subject to the following conditions:
13-
14-
The above copyright notice and this permission notice shall be included in all
15-
copies or substantial portions of the Software.
16-
17-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23-
SOFTWARE.
24-
25-
License for the jupyter-book on which the open education resource is built.
26-
271
MIT License
282

293
Copyright (c) 2018 Chris Holdgraf

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ The resource is currently hosted at [pythoninchemistry.org/sim_and_scat](https:/
88

99
## Sharing this resource
1010

11-
This OER is shared under a [CC BY-SA 4.0 license](./LICENSE.md).
12-
This means that anyone is free to copy and redistribute the resource in any medium or format and welcome to remix, transform, and build upon the material for any purpose, even commercially.
11+
The material within this OER is shared under a [CC BY 4.0 license](./content/LICENSE.md), while the jupyter-book software that is used to build the resource is shared under an [MIT license](./LICENSE.md)
12+
This means that anyone is free to copy and redistribute the material within the resource in any medium or format and welcome to remix, transform, and build upon the material for any purpose, even commercially.
1313
Basically you can do whatever you want with it, although we would appreciate if you would reference the original resource if you use it.
1414
Please use the reference below, or download it has a [BibTeX file](./sim_and_scat.bib).
1515
> McCluskey, A. R. [10.5281/zenodo.2543277](http://doi.org/10.5281/zenodo.2543277)
1616
1717
## Contributing to this resource
1818

19-
We welcome all contributions.
20-
The content of the webpages can be changed by editing the notebooks and markdown files the `content` directory.
19+
We welcome all contributions.
20+
The content of the webpages can be changed by editing the notebooks and markdown files the `content` directory.
2121
The ordering of the content is controlled by `data/toc.yml`.
2222
Pleaase feel free to make a pull request with your changes and we will try and review them ASAP.
2323

_build/intro.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ When the Thebelab integration fails, please use the Interact button.
4343

4444
If you use the "Interact" button, please be aware that we are since we are running on a free MyBinder resource, the launching of the Jupyter Notebook may be slow.
4545
We are investigating resources to run our own BinderHub in the future.
46-
Within the Jupyter Notebook in order to run a particular code block, select the cdoe button and click the "Run" button at the top of the page.
46+
Within the Jupyter Notebook in order to run a particular code block, select the cdoe button and click the "Run" button at the top of the page.
4747

4848
If you would prefer to run the resource locally, details of how this can be achieved can be found [here](https://github.com/pythoninchemistry/sim_and_scat/blob/master/content/local.md).
4949

@@ -55,7 +55,7 @@ However, we have endeavoured to provide code examples that are *authentic*, and
5555

5656
## Sharing this resource
5757

58-
This is an open educational resource, shared under a [CC BY-SA 4.0 license](./LICENSE.md).
58+
This is an open educational resource, shared under a [CC BY 4.0 license](./LICENSE.md).
5959
This means that anyone is free to copy and redistribute the resource in any medium or format and welcome to remix, transform, and build upon the material for any purpose, even commercially.
6060
Basically, you can do whatever you want with it, although we would appreciate if you would reference the original resource if you use it.
6161
Please use the reference below, or download it as a [BibTeX file](./sim_and_scat.bib).

content/LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
All content in this book (ie, any files and content in the `content/` folder)
44
is licensed under the
5-
[Creative Commons Attribution-ShareAlike 4.0 International](https://creativecommons.org/licenses/by-sa/4.0/) (CC BY-SA 4.0) license.
5+
[Creative Commons 4.0 International](https://creativecommons.org/licenses/by/4.0/) (CC BY 4.0) license.

content/intro.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ When the Thebelab integration fails, please use the Interact button.
3131

3232
If you use the "Interact" button, please be aware that we are since we are running on a free MyBinder resource, the launching of the Jupyter Notebook may be slow.
3333
We are investigating resources to run our own BinderHub in the future.
34-
Within the Jupyter Notebook in order to run a particular code block, select the cdoe button and click the "Run" button at the top of the page.
34+
Within the Jupyter Notebook in order to run a particular code block, select the cdoe button and click the "Run" button at the top of the page.
3535

3636
If you would prefer to run the resource locally, details of how this can be achieved can be found [here](https://github.com/pythoninchemistry/sim_and_scat/blob/master/content/local.md).
3737

@@ -43,7 +43,7 @@ However, we have endeavoured to provide code examples that are *authentic*, and
4343

4444
## Sharing this resource
4545

46-
This is an open educational resource, shared under a [CC BY-SA 4.0 license](./LICENSE.md).
46+
This is an open educational resource, shared under a [CC BY 4.0 license](./LICENSE.md).
4747
This means that anyone is free to copy and redistribute the resource in any medium or format and welcome to remix, transform, and build upon the material for any purpose, even commercially.
4848
Basically, you can do whatever you want with it, although we would appreciate if you would reference the original resource if you use it.
4949
Please use the reference below, or download it as a [BibTeX file](./sim_and_scat.bib).

0 commit comments

Comments
 (0)