| Message ID | xmqq5z4mjdbq.fsf@gitster.c.googlers.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | CoC: update to 2.0 | expand |
On 12/28/2020 7:59 AM, Junio C Hamano wrote: > At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted > a Code of Conduct from www.contributor-covenant.org; back then the > version adopted, 1.4, was the latest one. > > Version 2.0 tightens language in examples of unacceptable behaviour, > generalizes the audience from "contributors and maintainers" to > "community", and enhances the enforcement section. I approve of using the contributor covenant verbatim, and keeping it updated occasionally as they find ways to improve it is a good idea. Acked-by: Derrick Stolee <dstolee@microsoft.com> > -In the interest of fostering an open and welcoming environment, we as > -contributors and maintainers pledge to make participation in our project and > -our community a harassment-free experience for everyone, regardless of age, > -body size, disability, ethnicity, sex characteristics, gender identity and > -expression, level of experience, education, socio-economic status, > -nationality, personal appearance, race, religion, or sexual identity and > -orientation. > +We as members, contributors, and leaders pledge to make participation in our > +community a harassment-free experience for everyone, regardless of age, body > +size, visible or invisible disability, ethnicity, sex characteristics, gender > +identity and expression, level of experience, education, socio-economic status, > +nationality, personal appearance, race, religion, or sexual identity > +and orientation. > + > +We pledge to act and interact in ways that contribute to an open, welcoming, > +diverse, inclusive, and healthy community. This is a more active-voice way to say the same thing. Good. > ## Our Standards > > -Examples of behavior that contributes to creating a positive environment > -include: > +Examples of behavior that contributes to a positive environment for our > +community include: > > -* Using welcoming and inclusive language > -* Being respectful of differing viewpoints and experiences > -* Gracefully accepting constructive criticism > -* Focusing on what is best for the community > -* Showing empathy towards other community members > +* Demonstrating empathy and kindness toward other people I like that this one is at the top. > +* Being respectful of differing opinions, viewpoints, and experiences > +* Giving and gracefully accepting constructive feedback > +* Accepting responsibility and apologizing to those affected by our mistakes, > + and learning from the experience > +* Focusing on what is best not just for us as individuals, but for the > + overall community > > -Examples of unacceptable behavior by participants include: > +Examples of unacceptable behavior include: > > -* The use of sexualized language or imagery and unwelcome sexual attention or > - advances > -* Trolling, insulting/derogatory comments, and personal or political attacks > +* The use of sexualized language or imagery, and sexual attention or > + advances of any kind > +* Trolling, insulting or derogatory comments, and personal or political attacks > * Public or private harassment > -* Publishing others' private information, such as a physical or electronic > - address, without explicit permission > +* Publishing others' private information, such as a physical or email > + address, without their explicit permission > * Other conduct which could reasonably be considered inappropriate in a > professional setting This last one is a good reminder that remains constant: behavior in the community should be assumed to meet the bar of a professional setting. This means different things to different people, so the extra examples help clarify the expectations. > -## Our Responsibilities > +## Enforcement Responsibilities > > -Project maintainers are responsible for clarifying the standards of acceptable > -behavior and are expected to take appropriate and fair corrective action in > -response to any instances of unacceptable behavior. > +Community leaders are responsible for clarifying and enforcing our standards of > +acceptable behavior and will take appropriate and fair corrective action in > +response to any behavior that they deem inappropriate, threatening, offensive, > +or harmful. > > -Project maintainers have the right and responsibility to remove, edit, or > -reject comments, commits, code, wiki edits, issues, and other contributions > -that are not aligned to this Code of Conduct, or to ban temporarily or > -permanently any contributor for other behaviors that they deem inappropriate, > -threatening, offensive, or harmful. > +Community leaders have the right and responsibility to remove, edit, or reject > +comments, commits, code, wiki edits, issues, and other contributions that are > +not aligned to this Code of Conduct, and will communicate reasons for moderation > +decisions when appropriate. > > ## Scope > > -This Code of Conduct applies within all project spaces, and it also applies > -when an individual is representing the project or its community in public > -spaces. Examples of representing a project or community include using an > -official project e-mail address, posting via an official social media account, > -or acting as an appointed representative at an online or offline event. > -Representation of a project may be further defined and clarified by project > -maintainers. > +This Code of Conduct applies within all community spaces, and also applies when > +an individual is officially representing the community in public spaces. > +Examples of representing our community include using an official e-mail address, > +posting via an official social media account, or acting as an appointed > +representative at an online or offline event. > > ## Enforcement > > Instances of abusive, harassing, or otherwise unacceptable behavior may be > -reported by contacting the project team at git@sfconservancy.org. All > -complaints will be reviewed and investigated and will result in a response > -that is deemed necessary and appropriate to the circumstances. The project > -team is obligated to maintain confidentiality with regard to the reporter of > -an incident. Further details of specific enforcement policies may be posted > -separately. > - > -Project maintainers who do not follow or enforce the Code of Conduct in good > -faith may face temporary or permanent repercussions as determined by other > -members of the project's leadership. > - > -The project leadership team can be contacted by email as a whole at > -git@sfconservancy.org, or individually: > +reported to the community leaders responsible for enforcement by > +email as a whole at git@sfconservancy.org, or individually: > > - Ævar Arnfjörð Bjarmason <avarab@gmail.com> > - Christian Couder <christian.couder@gmail.com> > - Jeff King <peff@peff.net> > - Junio C Hamano <gitster@pobox.com> > > +All complaints will be reviewed and investigated promptly and fairly. > + > +All community leaders are obligated to respect the privacy and security of the > +reporter of any incident. > + > +## Enforcement Guidelines > + > +Community leaders will follow these Community Impact Guidelines in determining > +the consequences for any action they deem in violation of this Code of Conduct: > + > +### 1. Correction > + > +**Community Impact**: Use of inappropriate language or other behavior deemed > +unprofessional or unwelcome in the community. > + > +**Consequence**: A private, written warning from community leaders, providing > +clarity around the nature of the violation and an explanation of why the > +behavior was inappropriate. A public apology may be requested. > + > +### 2. Warning > + > +**Community Impact**: A violation through a single incident or series > +of actions. > + > +**Consequence**: A warning with consequences for continued behavior. No > +interaction with the people involved, including unsolicited interaction with > +those enforcing the Code of Conduct, for a specified period of time. This > +includes avoiding interactions in community spaces as well as external channels > +like social media. Violating these terms may lead to a temporary or > +permanent ban. > + > +### 3. Temporary Ban > + > +**Community Impact**: A serious violation of community standards, including > +sustained inappropriate behavior. > + > +**Consequence**: A temporary ban from any sort of interaction or public > +communication with the community for a specified period of time. No public or > +private interaction with the people involved, including unsolicited interaction > +with those enforcing the Code of Conduct, is allowed during this period. > +Violating these terms may lead to a permanent ban. > + > +### 4. Permanent Ban > + > +**Community Impact**: Demonstrating a pattern of violation of community > +standards, including sustained inappropriate behavior, harassment of an > +individual, or aggression toward or disparagement of classes of individuals. > + > +**Consequence**: A permanent ban from any sort of public interaction within > +the community. > + This new "mechanisms of enforcement" section is new, but helpful. It provides guidelines for leaders and expectations for community members. > ## Attribution > > -This Code of Conduct is adapted from the [Contributor Covenant][homepage], > -version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html > +This Code of Conduct is adapted from the Contributor Covenant, > +version 2.0, available at > +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. > > -[homepage]: https://www.contributor-covenant.org > +Community Impact Guidelines were inspired by > +Mozilla's code of conduct enforcement ladder. > > -For answers to common questions about this code of conduct, see > -https://www.contributor-covenant.org/faq > +For answers to common questions about this code of conduct, see the FAQ at > +https://www.contributor-covenant.org/faq. Translations are available > +at https://www.contributor-covenant.org/translations. I approve of this change in its entirety. Thanks for putting up with my (supportive) comments. Thanks, -Stolee
On 2020-12-28 at 12:59:53, Junio C Hamano wrote: > At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted > a Code of Conduct from www.contributor-covenant.org; back then the > version adopted, 1.4, was the latest one. > > Version 2.0 tightens language in examples of unacceptable behaviour, > generalizes the audience from "contributors and maintainers" to > "community", and enhances the enforcement section. > > The preamble we added to the beginning of the document has been > kept, but the rest of the test has been replaced in full from the > "upstream" and then the same customization for our community > (i.e. the way to contact community leadership teams) has been > applied. > > Signed-off-by: Junio C Hamano <gitster@pobox.com> This seems like a good improvement on the older version, and I agree we should update to it. Thanks for keeping on top of this. Acked-by: brian m. carlson <sandals@crustytoothpaste.net>
On Mon, Dec 28 2020, Junio C Hamano wrote: > At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted > a Code of Conduct from www.contributor-covenant.org; back then the > version adopted, 1.4, was the latest one. > > Version 2.0 tightens language in examples of unacceptable behaviour, > generalizes the audience from "contributors and maintainers" to > "community", and enhances the enforcement section. > > The preamble we added to the beginning of the document has been > kept, but the rest of the test has been replaced in full from the > "upstream" and then the same customization for our community > (i.e. the way to contact community leadership teams) has been > applied. I think the update to 2.0 makes sense. But would in general prefer less divergence with upstream for code or documents we copy/paste. So I submitted a v2 in https://lore.kernel.org/git/20201228171734.30038-1-avarab@gmail.com/ whose diff to upstream is half the size of yours. Perhaps you like it better, or not. In any case: Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> The thing I'm most on the fence about in 2.0 is the addition of very specific enforcement guidelines. They're still guidelines, so they're not a promise that we'll do things exactly like that. I still think the sentence from Jeff's addition of 1.4 makes more sense for us as a project: It probably make sense _not_ to get too specific at this point, and deal with specifics as they come up. E.g. the phrasing in the new "Temporary Ban" which seems to suggest that if we were to take action based on the CoC that it's up to us to police interaction between the parties involved on third-party social media platforms. I don't think it's going to be much of a practical concern. It just seems to me the upstream 2.0 CoC makes a lot of assumptions about projects being run in a way where they manage most of their communications infrastructure directly in a silo'd manner. We don't even manage the Git ML directly, and surely the main point the CoC is to communicate to existing and new project participants what's expected of them when it comes to interacting with the community. If the enforcment guidelines promise something that's unlikely to be practical in our case perhaps we'd be better off by leaving that entire section out of the CoC update.
On Mon, Dec 28, 2020 at 04:59:53AM -0800, Junio C Hamano wrote: > > At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted > a Code of Conduct from www.contributor-covenant.org; back then the > version adopted, 1.4, was the latest one. > > Version 2.0 tightens language in examples of unacceptable behaviour, > generalizes the audience from "contributors and maintainers" to > "community", and enhances the enforcement section. > > The preamble we added to the beginning of the document has been > kept, but the rest of the test has been replaced in full from the > "upstream" and then the same customization for our community > (i.e. the way to contact community leadership teams) has been > applied. > > Signed-off-by: Junio C Hamano <gitster@pobox.com> Thanks for pulling the update. Reviewed-by: Emily Shaffer <emilyshaffer@google.com> > --- > > * There was a thread to collect acks from community members at > > https://lore.kernel.org/git/xmqqd0f6n5a4.fsf_-_@gitster-ct.c.googlers.com/ > > and that was how you now see many acks in the trailer of > 5cdf2301. If we were to go ahead with this patch to move us to > version 2.0, we'd need a similar "Ack" drive, I guess.
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes: > I think the update to 2.0 makes sense. But would in general prefer less > divergence with upstream for code or documents we copy/paste. > > So I submitted a v2 in > https://lore.kernel.org/git/20201228171734.30038-1-avarab@gmail.com/ > whose diff to upstream is half the size of yours. Perhaps you like it > better, or not. I _think_ most of the divergence comes from the fact that I copied from a wrong variant. I somehow picked asciidoc variant and manually adjusted the section leaders, and I wouldn't be surprised if it wraps lines differently from their markdown variant. As I expect to be mostly offline this week, I'll let your series sit on the list while it collects Acks just like we did for the version 1.4, but in any case, let's go with your variant that is based on the official markdown version supplied by the upstream. Thanks.
On 28/12/20 04:59AM, Junio C Hamano wrote: > At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted > a Code of Conduct from www.contributor-covenant.org; back then the > version adopted, 1.4, was the latest one. > > Version 2.0 tightens language in examples of unacceptable behaviour, > generalizes the audience from "contributors and maintainers" to > "community", and enhances the enforcement section. > > The preamble we added to the beginning of the document has been > kept, but the rest of the test has been replaced in full from the s/test/text/ > "upstream" and then the same customization for our community > (i.e. the way to contact community leadership teams) has been > applied. > > Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git c/CODE_OF_CONDUCT.md w/CODE_OF_CONDUCT.md index fc4645d5c0..ac13a84d1a 100644 --- c/CODE_OF_CONDUCT.md +++ w/CODE_OF_CONDUCT.md @@ -8,86 +8,131 @@ this code of conduct may be banned from the community. ## Our Pledge -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to make participation in our project and -our community a harassment-free experience for everyone, regardless of age, -body size, disability, ethnicity, sex characteristics, gender identity and -expression, level of experience, education, socio-economic status, -nationality, personal appearance, race, religion, or sexual identity and -orientation. +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. ## Our Standards -Examples of behavior that contributes to creating a positive environment -include: +Examples of behavior that contributes to a positive environment for our +community include: -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community -Examples of unacceptable behavior by participants include: +Examples of unacceptable behavior include: -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks * Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission +* Publishing others' private information, such as a physical or email + address, without their explicit permission * Other conduct which could reasonably be considered inappropriate in a professional setting -## Our Responsibilities +## Enforcement Responsibilities -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. ## Scope -This Code of Conduct applies within all project spaces, and it also applies -when an individual is representing the project or its community in public -spaces. Examples of representing a project or community include using an -official project e-mail address, posting via an official social media account, -or acting as an appointed representative at an online or offline event. -Representation of a project may be further defined and clarified by project -maintainers. +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at git@sfconservancy.org. All -complaints will be reviewed and investigated and will result in a response -that is deemed necessary and appropriate to the circumstances. The project -team is obligated to maintain confidentiality with regard to the reporter of -an incident. Further details of specific enforcement policies may be posted -separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -The project leadership team can be contacted by email as a whole at -git@sfconservancy.org, or individually: +reported to the community leaders responsible for enforcement by +email as a whole at git@sfconservancy.org, or individually: - Ævar Arnfjörð Bjarmason <avarab@gmail.com> - Christian Couder <christian.couder@gmail.com> - Jeff King <peff@peff.net> - Junio C Hamano <gitster@pobox.com> +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html +This Code of Conduct is adapted from the Contributor Covenant, +version 2.0, available at +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. -[homepage]: https://www.contributor-covenant.org +Community Impact Guidelines were inspired by +Mozilla's code of conduct enforcement ladder. -For answers to common questions about this code of conduct, see -https://www.contributor-covenant.org/faq +For answers to common questions about this code of conduct, see the FAQ at +https://www.contributor-covenant.org/faq. Translations are available +at https://www.contributor-covenant.org/translations.
At 5cdf2301 (add a Code of Conduct document, 2019-09-24) we adopted a Code of Conduct from www.contributor-covenant.org; back then the version adopted, 1.4, was the latest one. Version 2.0 tightens language in examples of unacceptable behaviour, generalizes the audience from "contributors and maintainers" to "community", and enhances the enforcement section. The preamble we added to the beginning of the document has been kept, but the rest of the test has been replaced in full from the "upstream" and then the same customization for our community (i.e. the way to contact community leadership teams) has been applied. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- * There was a thread to collect acks from community members at https://lore.kernel.org/git/xmqqd0f6n5a4.fsf_-_@gitster-ct.c.googlers.com/ and that was how you now see many acks in the trailer of 5cdf2301. If we were to go ahead with this patch to move us to version 2.0, we'd need a similar "Ack" drive, I guess. CODE_OF_CONDUCT.md | 153 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 99 insertions(+), 54 deletions(-)