Fix markup of plain text CC-BY-SA 4.0 and CC-BY-ND 4.0 in Section 4

jodeebrowm commented 3 years ago

Fixes

Fixes #1198 by @jodeebrowm

Description

Fix layout, see diff.

Checklist

- [x] My pull request has a descriptive title (not a vague title like `Update index.md`). - [x] My pull request targets the *default* branch of the repository (`main` or `master`). - [x] My commit messages follow [best practices][best_practices]. - [ ] My code follows the established code style of the repository. - [ ] I added tests for the changes I made (if applicable). - [ ] I added or updated documentation (if applicable). - [x] I tried running the project locally and verified that there are no visible errors. [best_practices]:https://gist.github.com/robertpainsi/b632364184e70900af4ab688decf6f53 ## Developer Certificate of Origin

Developer Certificate of Origin

``` Developer Certificate of Origin Version 1.1 Copyright (C) 2004, 2006 The Linux Foundation and its contributors. 1 Letterman Drive Suite D4700 San Francisco, CA, 94129 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. ```

TimidRobot commented 3 years ago

Good catch!

However, before I merge it I need to verify that it doesn't cause issues with licensee/licensee (linked from Detecting a license - Licensing a repository - GitHub Docs)

I also need to search for similar cases where changes could be disruptive.

TimidRobot commented 3 years ago

Good catch!

However, before I merge it I need to verify that it doesn't cause issues with licensee/licensee (as well as search for similar cases where changes could be disruptive).

Source used for license identification is https://choosealicense.com/licenses/cc-by-sa-4.0/

@jodeebrowm once this has been merged, we'll also want to update choosealicense.com and licensee per licensee/CONTRIBUTING.md at master · licensee/licensee (I'm happy help or do so)

Related source files:

There may be some complexity additional with licensee to allow it to best detect multiple versions

TimidRobot commented 3 years ago

Licensee Detection

licensee/licensee detection looks good (detection threshold is 98%)

CC-BY-SA-4.0 Old/Current

License:        CC-BY-SA-4.0
Matched files:  LICENSE
LICENSE:
  Content hash:  20e2ae68f7dd2125beb70f732cd52d376687597f
  Confidence:    100.00%
  Matcher:       Licensee::Matchers::Exact
  License:       CC-BY-SA-4.0

CC-BY-SA-4.0 New/PR

License:        CC-BY-SA-4.0
Matched files:  LICENSE
LICENSE:
  Content hash:  0684e2df6671166351097b387abc0d1170d26f2f
  Confidence:    99.91%
  Matcher:       Licensee::Matchers::Dice
  License:       CC-BY-SA-4.0
  Closest non-matching licenses:
    CC-BY-SA-4.0 similarity:  99.91%
    CC-BY-4.0 similarity:     76.60%
    LPPL-1.3c similarity:     34.82%

jodeebrowm commented 3 years ago

Hi thanks for taking care of this.

Source used for license identification is https://choosealicense.com/licenses/cc-by-sa-4.0/

@jodeebrowm once this has been merged, we'll also want to update choosealicense.com and licensee per licensee/CONTRIBUTING.md at master · licensee/licensee (I'm happy help or do so)

Haven't had time to look at the source/structure of licensee. Should I open an issue there so we can track this or should we discuss it here?

sarahpearson commented 3 years ago

Reminder for us to add this change to errata page once it is merged.

jodeebrowm commented 3 years ago

Any progress on this?

TimidRobot commented 2 years ago

Any progress on this?

@jodeebrowm thank you for the reminder. I'll talk to legal next week and add a release schedule if it can't be handled soon.

TimidRobot commented 2 years ago

Changes deployed to production Mon 27 Jun 2022 06:42:45 PM UTC. It may take up to 30 minutes for caches to expire.

creativecommons / creativecommons.org