-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update license to CC-BY-SA-4.0 #74
base: master
Are you sure you want to change the base?
Conversation
Attribution-ShareAlike 4.0 International | ||
|
||
======================================================================= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A problem:
There's non-CC content here. Like the social icons:
- https://github.com/neuropoly/neuro.polymtl.ca/blob/52903f3245aa23228dc3d6ba7b637db3dbd16fc5/.gitbook/assets/github-mark-20px.png
- https://github.com/neuropoly/neuro.polymtl.ca/blob/52903f3245aa23228dc3d6ba7b637db3dbd16fc5/.gitbook/assets/mail-142.png
- https://github.com/neuropoly/neuro.polymtl.ca/blob/52903f3245aa23228dc3d6ba7b637db3dbd16fc5/.gitbook/assets/logo_youtube.png
I derived this template from https://github.com/executablebooks/sphinx-book-theme which is BSD 3-Clause
So I think we actually need to add multiple sections to this license file, mentioning which files are covered by which license?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think so, but we can try to keep it as easy as possible by limiting the others license to files we already have and even replace them if it's possible to reduce special cases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree, replacing content if we have to would help a lot.
By submitting content, you agree to license it under the terms set out in [LICENSE](./LICENSE) -- the [CC-BY-SA-4.0](https://creativecommons.org/licenses/by-sa/4.0/) license, | ||
and that you have the right to submit it -- it's either your own work or copy-pasted from content that's also open (like answers on StackOverflow). | ||
|
||
To honour the "BY" clause, your contributions will be credited by the `git log`, which can be viewed [here](https://github.com/neuropoly/neuro.polymtl.ca/graphs/contributors). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this good enough to be legally binding?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also is it clear and fair and accessible?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's clear, fair and accessible but if you want to make it even clearer and avoid any potential error we can add an info text on a Pull-Request template of Github
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# Contributing | ||
|
||
To make edits to this site, just click the edit icon on a page on the live site to launch the GitHub code editor. | ||
If you are a member of the lab you can commit straight to `master` and for 95% of changes that is what you should do; | ||
do not bother submitting pull requests for this repo; we can always revert if we need to. | ||
|
||
After committing to `master`, the site will rebuild and redeploy to https://neuro.polymtl.ca/ within a minute or so. | ||
You can watch its progress on the [Actions Tab](https://github.com/neuropoly/neuro.polymtl.ca/actions/workflows/publish.yml)! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should make sure this doesn't mess up the sphinx build.
This file isn't in any toctree
so I think sphinx should just ignore it, but we better double-check.
Shield: [![CC BY-SA 4.0][cc-by-sa-shield]][cc-by-sa] | ||
|
||
This site is licensed under a | ||
[Creative Commons Attribution-ShareAlike 4.0 International License][cc-by-sa]. | ||
|
||
[![CC BY-SA 4.0][cc-by-sa-image]][cc-by-sa] | ||
|
||
[cc-by-sa]: http://creativecommons.org/licenses/by-sa/4.0/ | ||
[cc-by-sa-image]: https://licensebuttons.net/l/by-sa/4.0/88x31.png | ||
[cc-by-sa-shield]: https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's make sure this renders right in sphinx before committing.
material as expected. Licensors should clearly mark any | ||
material not subject to the license. This includes other CC- | ||
licensed material, or material used under an exception or |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, this is just what I meant
Our previous site/wiki was a DokuWiki site with content under CC-BY-SA-3.0. All content on the site that predates the switchover on May 6th last summer is covered by that.
But all content added since then is in a legal grey zone, since we did not add a clear
LICENSE
at the time.To clean up the situation, and also modernize the legal code, add
LICENSE
=CC-BY-SA-4.0
and a clearCONTRIBUTING.md
that makes clear contributions will be taken under that license.CC-BY-SA-3.0 is forward-compatible with CC-BY-SA-4.0, so this change does not need to involve content predating the switchover.
But everyone who has added content (current count: 32) since the switchover will need to give informed consent to this for this to be merged.
Fixes #73
(by the way, I got the bulk of the text from https://github.com/santisoler/cc-licenses)
This is the mirror of neuropoly/intranet.neuro.polymtl.ca#69