CC-BY-ND-2.0: Return to CC-BY-ND-2.0 (had CC-BY-ND-3.0 text) #455
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is in upstream's current text [1], and seems to have been added between [2] and [3]. Use the <optional> wrapper so we continue to match both the old and new versions. [1]: https://creativecommons.org/licenses/by-nd/4.0/legalcode [2]: https://web.archive.org/web/20141111232312/https://creativecommons.org/licenses/by-nd/4.0/legalcode [3]: https://web.archive.org/web/20141119001617/https://creativecommons.org/licenses/by-nd/4.0/legalcode
The initial entry in this repo had the 2.0 text, but f12d5fe (Update CC-BY-ND-2.0, 2016-09-15, spdx#27) injected the 3.0 wording my mistake. This commit returns us to the current upstream wording for the 2.0 license. The <optional> space unambiguously allows the upstream's (accidental?) current lack of a space there: $ curl -s https://creativecommons.org/licenses/by-nd/2.0/legalcode | grep 'Restrictions.' <p><strong>4. Restrictions.</strong>The license granted in Section 3 above... The <optional> s in https accounts for the upstream change between [1] and [2]. [1]: https://web.archive.org/web/20141119175856/https://creativecommons.org/licenses/by-nd/2.0/legalcode [2]: https://web.archive.org/web/20141220194853/https://creativecommons.org/licenses/by-nd/2.0/legalcode
goneall
approved these changes
Dec 1, 2017
mlinksva
added a commit
to mlinksva/license-list-XML
that referenced
this pull request
Dec 21, 2017
the notice is present in all 6 of the CC-BY*-4.0 licenses as published on the creativecommons.org site as spdx#455 notes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The initial entry in this repo had the 2.0 text, but f12d5fe (#27) injected the 3.0 wording my mistake. This commit returns us to the current upstream wording for the 2.0 license.
I've also (optionally) included the new CC0 dedication in upstream's
CC-BY-ND-4.0so the wholeCC-BY-ND-*series matches upstream (using my comparison procedure from here).More details in the commit messages, if folks are curious about any particular change.
Fixes #448.