CoC: update to version 2.0 + local changes

Commit Message

Junio C Hamano Jan. 13, 2021, 8:33 a.m. UTC

Here is to remind those of you who may want to add your Acked-by to
Ævar's proposed update to show your support.  I've collected ones on
the list I saw in replies to the original proposal [*1*] but in case
I missed yours...

Thanks.

[Reference]

*1* Message-Id: <[e-mail]>

----- >8 ---------- >8 ---------- >8 ---------- >8 ---------- >8 -----
From: Ævar Arnfjörð Bjarmason <[e-mail]>
Subject: [PATCH] CoC: update to version 2.0 + local changes

Update the CoC added in 5cdf2301 (add a Code of Conduct document,
2019-09-24 from version 1.4 to version 2.0. This is the version found
at [1] with the following minor changes:

 - We preserve the change to the CoC in 3f9ef874a73 (CODE_OF_CONDUCT:
   mention individual project-leader emails, 2019-09-26)

 - We preserve the custom intro added in 5cdf2301d4a (add a Code of
   Conduct document, 2019-09-24)

This change intentionally preserves a warning emitted on "git diff
--check". It's better to make it easily diff-able with upstream than
to fix whitespace changes in our version while we're at it.

1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md

Signed-off-by: Ævar Arnfjörð Bjarmason <[e-mail]>
Acked-by: Christian Couder <[e-mail]>
Acked-by: Derrick Stolee <[e-mail]>
Acked-by: Elijah Newren <[e-mail]>
Acked-by: Johannes Schindelin <[e-mail]>
Acked-by: Jonathan Nieder <[e-mail]>
Acked-by: brian m. carlson <[e-mail]>
Signed-off-by: Junio C Hamano <[e-mail]>
---
 CODE_OF_CONDUCT.md | 153 ++++++++++++++++++++++++++++++---------------
 1 file changed, 104 insertions(+), 49 deletions(-)

Comments

Junio C Hamano Jan. 13, 2021, 9:05 a.m. UTC | #1

Junio C Hamano <[e-mail]> writes:

> Here is to remind those of you who may want to add your Acked-by to
> Ævar's proposed update to show your support.  I've collected ones on
> the list I saw in replies to the original proposal [*1*] but in case
> I missed yours...
>
> Thanks.
> ...
> [Reference]
>
> *1* Message-Id: <[e-mail]>
>
> ----- >8 ---------- >8 ---------- >8 ---------- >8 ---------- >8 -----
> From: Ævar Arnfjörð Bjarmason <[e-mail]>
> Subject: [PATCH] CoC: update to version 2.0 + local changes
>
> Update the CoC added in 5cdf2301 (add a Code of Conduct document,
> 2019-09-24 from version 1.4 to version 2.0. This is the version found
> at [1] with the following minor changes:
>
>  - We preserve the change to the CoC in 3f9ef874a73 (CODE_OF_CONDUCT:
>    mention individual project-leader emails, 2019-09-26)
>
>  - We preserve the custom intro added in 5cdf2301d4a (add a Code of
>    Conduct document, 2019-09-24)
>
> This change intentionally preserves a warning emitted on "git diff
> --check". It's better to make it easily diff-able with upstream than
> to fix whitespace changes in our version while we're at it.
>
> 1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <[e-mail]>
> Acked-by: Christian Couder <[e-mail]>
> Acked-by: Derrick Stolee <[e-mail]>
> Acked-by: Elijah Newren <[e-mail]>
> Acked-by: Johannes Schindelin <[e-mail]>
> Acked-by: Jonathan Nieder <[e-mail]>
> Acked-by: brian m. carlson <[e-mail]>
> Signed-off-by: Junio C Hamano <[e-mail]>
> ---

I guess I should lead by an example ;-)  The above misses mine and
Signed-off-by means a totally different thing [*1*] from Acked-by.

    Acked-by: Junio C Hamano <[e-mail]>


[Footnote]

*1* Most importantly, signing off is about recording provenance of
    the change. You certify that you have enough rights to pass the
    patch along to the project, and you agree that the fact that you
    contributed the patch will be recorded in perpetuity.  It does
    not mean that you agree to the change in the patch and you do
    not assure correctness of the patch by signing it off.  I signed
    off the above patch to say I got it from Ævar and committing it
    as-is, but it does not say that I agree with the move of our CoC
    to Contributor Covenant 2.0, hence my Ack here.

Taylor Blau Jan. 13, 2021, 3:25 p.m. UTC | #2

On Wed, Jan 13, 2021 at 12:33:23AM -0800, Junio C Hamano wrote:
> Here is to remind those of you who may want to add your Acked-by to
> Ævar's proposed update to show your support.  I've collected ones on
> the list I saw in replies to the original proposal [*1*] but in case
> I missed yours...

Acked-by: Taylor Blau <[e-mail]>

Thanks,
Taylor

Jeff King Jan. 13, 2021, 5:55 p.m. UTC | #3

On Wed, Jan 13, 2021 at 01:05:09AM -0800, Junio C Hamano wrote:

> > Signed-off-by: Ævar Arnfjörð Bjarmason <[e-mail]>
> > Acked-by: Christian Couder <[e-mail]>
> > Acked-by: Derrick Stolee <[e-mail]>
> > Acked-by: Elijah Newren <[e-mail]>
> > Acked-by: Johannes Schindelin <[e-mail]>
> > Acked-by: Jonathan Nieder <[e-mail]>
> > Acked-by: brian m. carlson <[e-mail]>
> > Signed-off-by: Junio C Hamano <[e-mail]>
> > ---
> 
> I guess I should lead by an example ;-)  The above misses mine and
> Signed-off-by means a totally different thing [*1*] from Acked-by.
> 
>     Acked-by: Junio C Hamano <[e-mail]>

I thought your "From" would be enough, but I see this re-wrapped version
if "From: Ævar" (so I guess my same argument applies for him ;) ).

Thanks for reposting this; I was trying hard not to look at my email
during the week of the original thread.

I agree with the sentiment expressed earlier that the "consequences" are
a little funny for us, since our decentralized infrastructure makes
things like banning a bit confusing. But that was already present to
some degree in the older version, and I do like the notion that we'd
stick to the original as closely as possible. So:

  Acked-by: Jeff King <[e-mail]>

-Peff

Jonathan Tan Jan. 13, 2021, 6:58 p.m. UTC | #4

Thanks for the reminder.

Acked-by: Jonathan Tan <[e-mail]>

Patch

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 083bd872c5..65651beada 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -8,70 +8,64 @@  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 [e-mail]. 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
+reported to the community leaders responsible for enforcement at
 [e-mail], or individually:
 
   - Ævar Arnfjörð Bjarmason <[e-mail]>
@@ -79,12 +73,73 @@  [e-mail], or individually:
   - Jeff King <[e-mail]>
   - Junio C Hamano <[e-mail]>
 
+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][homepage],
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+
+Community Impact Guidelines were inspired by 
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
+at [https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq