Skip to content

Commit 5bffe8f

Browse files
committed
Update README, CONTRIBUTING, LICENSE w/CC-BY
[skip ci]
1 parent b461887 commit 5bffe8f

File tree

3 files changed

+33
-17
lines changed

3 files changed

+33
-17
lines changed

CONTRIBUTING.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,13 @@ situation. When in doubt, ask!
281281

282282
## Issue & PR Templates
283283

284-
The project is configured with a PR template and a couple of issue templates, to
284+
I've set up the project with a PR template and a couple of issue templates, to
285285
hopefully make it easier to provide all the information needed to act on code
286286
contributions, bug reports, and feature requests. If the templates don't fit the
287287
issue/PR you want to create, though, then don't use them.
288288

289289

290290
## License
291291

292-
All contributions will take on the MIT License of the project at large.
292+
All code and documentation contributions will respectively take on the MIT
293+
License and CC-BY 4.0 license of the project at large.

LICENSE.txt

+25-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,33 @@
1+
The sphobjinv documentation (including docstrings) is licensed under a Creative
2+
Commons Attribution 4.0 International License (CC-BY).
3+
4+
See http://creativecommons.org/licenses/by/4.0/.
5+
6+
7+
The sphobjinv codebase is released under the MIT License, the text of which is
8+
included below.
9+
10+
11+
====================================================================================
12+
13+
114
The MIT License (MIT)
215

3-
Copyright (c) 2016-2022 Brian Skinn
16+
Copyright (c) 2016-2022 Brian Skinn and community contributors
417

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
18+
Permission is hereby granted, free of charge, to any person obtaining a copy of
19+
this software and associated documentation files (the "Software"), to deal in
20+
the Software without restriction, including without limitation the rights to
21+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
22+
the Software, and to permit persons to whom the Software is furnished to do so,
23+
subject to the following conditions:
1124

1225
The above copyright notice and this permission notice shall be included in all
1326
copies or substantial portions of the Software.
1427

1528
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
29+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
30+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
31+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
32+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
33+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.rst

+5-2
Original file line numberDiff line numberDiff line change
@@ -185,5 +185,8 @@ and feature requests are welcomed at the
185185

186186
Copyright (c) Brian Skinn 2016-2022
187187

188-
License: The MIT License. See `LICENSE.txt <https://github.com/bskinn/sphobjinv/blob/main/LICENSE.txt>`__
189-
for full license terms.
188+
The ``sphobjinv`` documentation (including docstrings) is licensed under a
189+
`Creative Commons Attribution 4.0 International License <http://creativecommons.org/licenses/by/4.0/>`__
190+
(CC-BY). The ``sphobjinv`` codebase is released under the MIT License. See
191+
`LICENSE.txt <https://github.com/bskinn/sphobjinv/blob/main/LICENSE.txt>`__ for
192+
full license terms.

0 commit comments

Comments
 (0)