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 <avarab@gmail.com> Acked-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Derrick Stolee <dstolee@microsoft.com> Acked-by: Elijah Newren <newren@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: brian m. carlson <sandals@crustytoothpaste.net> Acked-by: Jeff King <peff@peff.net> Acked-by: Taylor Blau <me@ttaylor.com> Acked-by: Jonathan Tan <jonathantanmy@google.com> Acked-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Dec 28, 2020 at 18:17 UTC
0d28d3cf335ea36c8df26fff2722f204a637dc4d
1 file changed
+104
-49
CODE_OF_CONDUCT.md
+104
-49
@@ -8,70 +8,64 @@ this code of conduct may be banned from the community.
8
9
## Our Pledge
10
11
-In the interest of fostering an open and welcoming environment, we as
12
-contributors and maintainers pledge to make participation in our project and
13
-our community a harassment-free experience for everyone, regardless of age, body
14
-size, disability, ethnicity, sex characteristics, gender identity and expression,
15
-level of experience, education, socio-economic status, nationality, personal
16
-appearance, race, religion, or sexual identity and orientation.
11
+We as members, contributors, and leaders pledge to make participation in our
12
+community a harassment-free experience for everyone, regardless of age, body
13
+size, visible or invisible disability, ethnicity, sex characteristics, gender
14
+identity and expression, level of experience, education, socio-economic status,
15
+nationality, personal appearance, race, religion, or sexual identity
16
+and orientation.
17
+
18
+We pledge to act and interact in ways that contribute to an open, welcoming,
19
+diverse, inclusive, and healthy community.
20
21
## Our Standards
22
20
-Examples of behavior that contributes to creating a positive environment
21
-include:
23
+Examples of behavior that contributes to a positive environment for our
24
+community include:
25
23
-* Using welcoming and inclusive language
24
-* Being respectful of differing viewpoints and experiences
25
-* Gracefully accepting constructive criticism
26
-* Focusing on what is best for the community
27
-* Showing empathy towards other community members
26
+* Demonstrating empathy and kindness toward other people
27
+* Being respectful of differing opinions, viewpoints, and experiences
28
+* Giving and gracefully accepting constructive feedback
29
+* Accepting responsibility and apologizing to those affected by our mistakes,
30
+ and learning from the experience
31
+* Focusing on what is best not just for us as individuals, but for the
32
+ overall community
33
29
-Examples of unacceptable behavior by participants include:
34
+Examples of unacceptable behavior include:
35
31
-* The use of sexualized language or imagery and unwelcome sexual attention or
32
- advances
33
-* Trolling, insulting/derogatory comments, and personal or political attacks
36
+* The use of sexualized language or imagery, and sexual attention or
37
+ advances of any kind
38
+* Trolling, insulting or derogatory comments, and personal or political attacks
39
* Public or private harassment
35
-* Publishing others' private information, such as a physical or electronic
36
- address, without explicit permission
40
+* Publishing others' private information, such as a physical or email
41
+ address, without their explicit permission
42
* Other conduct which could reasonably be considered inappropriate in a
43
professional setting
44
40
-## Our Responsibilities
45
+## Enforcement Responsibilities
46
42
-Project maintainers are responsible for clarifying the standards of acceptable
43
-behavior and are expected to take appropriate and fair corrective action in
44
-response to any instances of unacceptable behavior.
47
+Community leaders are responsible for clarifying and enforcing our standards of
48
+acceptable behavior and will take appropriate and fair corrective action in
49
+response to any behavior that they deem inappropriate, threatening, offensive,
50
+or harmful.
51
46
-Project maintainers have the right and responsibility to remove, edit, or
47
-reject comments, commits, code, wiki edits, issues, and other contributions
48
-that are not aligned to this Code of Conduct, or to ban temporarily or
49
-permanently any contributor for other behaviors that they deem inappropriate,
50
-threatening, offensive, or harmful.
52
+Community leaders have the right and responsibility to remove, edit, or reject
53
+comments, commits, code, wiki edits, issues, and other contributions that are
54
+not aligned to this Code of Conduct, and will communicate reasons for moderation
55
+decisions when appropriate.
56
57
## Scope
58
54
-This Code of Conduct applies within all project spaces, and it also applies when
55
-an individual is representing the project or its community in public spaces.
56
-Examples of representing a project or community include using an official
57
-project e-mail address, posting via an official social media account, or acting
58
-as an appointed representative at an online or offline event. Representation of
59
-a project may be further defined and clarified by project maintainers.
59
+This Code of Conduct applies within all community spaces, and also applies when
60
+an individual is officially representing the community in public spaces.
61
+Examples of representing our community include using an official e-mail address,
62
+posting via an official social media account, or acting as an appointed
63
+representative at an online or offline event.
64
65
## Enforcement
66
67
Instances of abusive, harassing, or otherwise unacceptable behavior may be
64
-reported by contacting the project team at git@sfconservancy.org. All
65
-complaints will be reviewed and investigated and will result in a response that
66
-is deemed necessary and appropriate to the circumstances. The project team is
67
-obligated to maintain confidentiality with regard to the reporter of an incident.
68
-Further details of specific enforcement policies may be posted separately.
69
-
70
-Project maintainers who do not follow or enforce the Code of Conduct in good
71
-faith may face temporary or permanent repercussions as determined by other
72
-members of the project's leadership.
73
-
74
-The project leadership team can be contacted by email as a whole at
68
+reported to the community leaders responsible for enforcement at
69
git@sfconservancy.org, or individually:
70
71
- Ævar Arnfjörð Bjarmason <avarab@gmail.com>
@@ -79,12 +73,73 @@ git@sfconservancy.org, or individually:
73
- Jeff King <peff@peff.net>
74
- Junio C Hamano <gitster@pobox.com>
75
76
+All complaints will be reviewed and investigated promptly and fairly.
77
+
78
+All community leaders are obligated to respect the privacy and security of the
79
+reporter of any incident.
80
+
81
+## Enforcement Guidelines
82
+
83
+Community leaders will follow these Community Impact Guidelines in determining
84
+the consequences for any action they deem in violation of this Code of Conduct:
85
+
86
+### 1. Correction
87
+
88
+**Community Impact**: Use of inappropriate language or other behavior deemed
89
+unprofessional or unwelcome in the community.
90
+
91
+**Consequence**: A private, written warning from community leaders, providing
92
+clarity around the nature of the violation and an explanation of why the
93
+behavior was inappropriate. A public apology may be requested.
94
+
95
+### 2. Warning
96
+
97
+**Community Impact**: A violation through a single incident or series
98
+of actions.
99
+
100
+**Consequence**: A warning with consequences for continued behavior. No
101
+interaction with the people involved, including unsolicited interaction with
102
+those enforcing the Code of Conduct, for a specified period of time. This
103
+includes avoiding interactions in community spaces as well as external channels
104
+like social media. Violating these terms may lead to a temporary or
105
+permanent ban.
106
+
107
+### 3. Temporary Ban
108
+
109
+**Community Impact**: A serious violation of community standards, including
110
+sustained inappropriate behavior.
111
+
112
+**Consequence**: A temporary ban from any sort of interaction or public
113
+communication with the community for a specified period of time. No public or
114
+private interaction with the people involved, including unsolicited interaction
115
+with those enforcing the Code of Conduct, is allowed during this period.
116
+Violating these terms may lead to a permanent ban.
117
+
118
+### 4. Permanent Ban
119
+
120
+**Community Impact**: Demonstrating a pattern of violation of community
121
+standards, including sustained inappropriate behavior, harassment of an
122
+individual, or aggression toward or disparagement of classes of individuals.
123
+
124
+**Consequence**: A permanent ban from any sort of public interaction within
125
+the community.
126
+
127
## Attribution
128
84
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
85
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
129
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
130
+version 2.0, available at
131
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
132
+
133
+Community Impact Guidelines were inspired by
134
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
135
+
136
+For answers to common questions about this code of conduct, see the FAQ at
137
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
138
+at [https://www.contributor-covenant.org/translations][translations].
139
140
[homepage]: https://www.contributor-covenant.org
141
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
142
+[Mozilla CoC]: https://github.com/mozilla/diversity
143
+[FAQ]: https://www.contributor-covenant.org/faq
144
+[translations]: https://www.contributor-covenant.org/translations
145
89
-For answers to common questions about this code of conduct, see
90
-https://www.contributor-covenant.org/faq