Skip to content
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

CC0 1.1 w/o gendered pronouns #1149

Merged
merged 3 commits into from Sep 9, 2020

Conversation

ryancdotorg
Copy link

Fixes

Partial fix for #1143 - no updates to non-English versions.

Description

Changes all "he or she" and "his or her" references to use singular they.

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the default branch of the repository (main or master).
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • [n/a] I added tests for the changes I made (if applicable).
  • [n/a] I added or updated documentation (if applicable).
  • [n/a] I tried running the project locally and verified that there are no
    visible errors.

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.

@ryancdotorg ryancdotorg requested review from a team and kgodey and removed request for a team August 14, 2020 16:36
@TimidRobot TimidRobot self-assigned this Aug 14, 2020
@TimidRobot TimidRobot changed the base branch from master to cc0-1-1-proposed August 14, 2020 18:29
@TimidRobot
Copy link
Member

I have changed the merge destination to a branch. Actually updating the license is much more involved and is led by the Creative Commons Legal Team.

I will be reviewing this PR with the following goals:

  1. preserve changes so they can inform license update process
  2. ensure technical changes are as accurate as possible and the path to an update license is as short as possible

@TimidRobot TimidRobot requested review from TimidRobot and removed request for kgodey August 14, 2020 18:34
@oddhack
Copy link

oddhack commented Aug 15, 2020

As the OP on the underlying issue, I took a broader look and only see this happening elsewhere in CC-PDDC ("A certifier, moreover, dedicates any copyright interest he may have in the associated work..."), though I was literally searching for " he " and not doing a deep dive on all the license texts.

@ryancdotorg
Copy link
Author

You can use grep -P '\b(he|she|his|her)\b' to look a bit more thoroughly - the \b looks for a word/non-word boundary and so will find these words at the start or end of a line as well as the middle.

@oddhack
Copy link

oddhack commented Aug 15, 2020

You can use grep -P '\b(he|she|his|her)\b' to look a bit more thoroughly - the \b looks for a word/non-word boundary and so will find these words at the start or end of a line as well as the middle.

Google has a little CI script based on the AOSP Coding with Respect guidelines to check for this stuff - see google/amber#897 . We are planning to integrate it into our CI soon and hopefully others will, or similar checks, as well. Above I was just searching on the website. Fortunately lawyers do not tend to use contractions :-)

Copy link
Member

@TimidRobot TimidRobot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requested changes:

  • remove retired legal changes

Informational:

docroot/legalcode/zero-waive_1.1_us.html Outdated Show resolved Hide resolved
docroot/legalcode/zero-assert_1.1_us.html Outdated Show resolved Hide resolved
docroot/legalcode/zero_1.1.html Show resolved Hide resolved
docroot/legalcode/zero_1.1.txt Show resolved Hide resolved
@TimidRobot TimidRobot self-requested a review September 9, 2020 16:25
@TimidRobot TimidRobot merged commit ca42e5e into creativecommons:cc0-1-1-proposed Sep 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants