Skip to content

Commit ed5352f

Browse files
kartbenfabiobaltieri
authored andcommitted
coc: Update Code of Conduct to latest Contributor Covenant
As per the changelog of the Contributor Covenant between versions 1.4 and 2.1, the main changes are: 2.0 - Emphasizes 'community' over 'project' scope, effectively merging the Community Covenant into the Contributor Covenant - Adds expectation about accepting responsibility and apologizing to those affected by mistakes, and learning from the experience to the list - Adds sexual attention and advances of any kind as unacceptable behavior example - Moves enforcement responsibilities from project maintainers to community leaders - Adds responsibility to communicate reasons for moderation decisions when removing, editing, or rejecting contributions not aligned to the Code of Conduct - Requires community leaders to respect privacy and security of the reporter of any incident, not just confidentiality - Provides a template for code of conduct enforcement 2.1 - Adds 'caste' and 'color' to the preamble Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
1 parent 098df08 commit ed5352f

File tree

1 file changed

+112
-51
lines changed

1 file changed

+112
-51
lines changed

CODE_OF_CONDUCT.md

+112-51
Original file line numberDiff line numberDiff line change
@@ -2,77 +2,138 @@
22

33
## Our Pledge
44

5-
In the interest of fostering an open and welcoming environment, we as
6-
contributors and maintainers pledge to making participation in our project and
7-
our community a harassment-free experience for everyone, regardless of age, body
8-
size, disability, ethnicity, sex characteristics, gender identity and expression,
9-
level of experience, education, socio-economic status, nationality, personal
10-
appearance, race, religion, or sexual identity and orientation.
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
1114

1215
## Our Standards
1316

14-
Examples of behavior that contributes to creating a positive environment
15-
include:
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
1619

17-
* Using welcoming and inclusive language
18-
* Being respectful of differing viewpoints and experiences
19-
* Gracefully accepting constructive criticism
20-
* Focusing on what is best for the community
21-
* Showing empathy towards other community members
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the overall
26+
community
2227

23-
Examples of unacceptable behavior by participants include:
28+
Examples of unacceptable behavior include:
2429

25-
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
27-
* Trolling, insulting/derogatory comments, and personal or political attacks
30+
* The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
2833
* Public or private harassment
29-
* Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
3136
* Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
37+
professional setting
3338

34-
## Our Responsibilities
39+
## Enforcement Responsibilities
3540

36-
Project maintainers are responsible for clarifying the standards of acceptable
37-
behavior and are expected to take appropriate and fair corrective action in
38-
response to any instances of unacceptable behavior.
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
3945

40-
Project maintainers have the right and responsibility to remove, edit, or
41-
reject comments, commits, code, wiki edits, issues, and other contributions
42-
that are not aligned to this Code of Conduct, or to ban temporarily or
43-
permanently any contributor for other behaviors that they deem inappropriate,
44-
threatening, offensive, or harmful.
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
4550

4651
## Scope
4752

48-
This Code of Conduct applies both within project spaces and in public spaces
49-
when an individual is representing the project or its community. Examples of
50-
representing a project or community include using an official project e-mail
51-
address, posting via an official social media account, or acting as an appointed
52-
representative at an online or offline event. Representation of a project may be
53-
further defined and clarified by project maintainers.
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
5458

5559
## Enforcement
5660

5761
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at conduct@zephyrproject.org.
59-
Reports will be received by Kate Stewart (Linux Foundation) and Amy Occhialino
60-
(Intel). All complaints will be reviewed and investigated, and will result in a
61-
response that is deemed necessary and appropriate to the circumstances. The
62-
project team is obligated to maintain confidentiality with regard to the
63-
reporter of an incident. Further details of specific enforcement policies may
64-
be posted separately.
65-
66-
Project maintainers who do not follow or enforce the Code of Conduct in good
67-
faith may face temporary or permanent repercussions as determined by other
68-
members of the project's leadership.
62+
reported to the community leaders responsible for enforcement at
63+
conduct@zephyrproject.org. Reports will be received by the Chair of the Zephyr
64+
Governing Board, the Zephyr Project Director (Linux Foundation), and the Zephyr
65+
Project Developer Advocate (Linux Foundation). You may refer to the [Governing
66+
Board](https://zephyrproject.org/governing-board/) and [Linux Foundation
67+
Staff](https://zephyrproject.org/staff/) web pages to identify who are the
68+
individuals currently holding these positions.
69+
All complaints will be reviewed and investigated promptly and fairly.
70+
71+
All community leaders are obligated to respect the privacy and security of the
72+
reporter of any incident.
73+
74+
## Enforcement Guidelines
75+
76+
Community leaders will follow these Community Impact Guidelines in determining
77+
the consequences for any action they deem in violation of this Code of Conduct:
78+
79+
### 1. Correction
80+
81+
**Community Impact**: Use of inappropriate language or other behavior deemed
82+
unprofessional or unwelcome in the community.
83+
84+
**Consequence**: A private, written warning from community leaders, providing
85+
clarity around the nature of the violation and an explanation of why the
86+
behavior was inappropriate. A public apology may be requested.
87+
88+
### 2. Warning
89+
90+
**Community Impact**: A violation through a single incident or series of
91+
actions.
92+
93+
**Consequence**: A warning with consequences for continued behavior. No
94+
interaction with the people involved, including unsolicited interaction with
95+
those enforcing the Code of Conduct, for a specified period of time. This
96+
includes avoiding interactions in community spaces as well as external channels
97+
like social media. Violating these terms may lead to a temporary or permanent
98+
ban.
99+
100+
### 3. Temporary Ban
101+
102+
**Community Impact**: A serious violation of community standards, including
103+
sustained inappropriate behavior.
104+
105+
**Consequence**: A temporary ban from any sort of interaction or public
106+
communication with the community for a specified period of time. No public or
107+
private interaction with the people involved, including unsolicited interaction
108+
with those enforcing the Code of Conduct, is allowed during this period.
109+
Violating these terms may lead to a permanent ban.
110+
111+
### 4. Permanent Ban
112+
113+
**Community Impact**: Demonstrating a pattern of violation of community
114+
standards, including sustained inappropriate behavior, harassment of an
115+
individual, or aggression toward or disparagement of classes of individuals.
116+
117+
**Consequence**: A permanent ban from any sort of public interaction within the
118+
community.
69119

70120
## Attribution
71121

72-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
73-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
122+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
123+
version 2.1, available at
124+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
125+
The only changes made by The Zephyr Project to the original document were to
126+
make explicit who the recipients of Code of Conduct incident reports are.
74127

75-
[homepage]: https://www.contributor-covenant.org
128+
Community Impact Guidelines were inspired by
129+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
76130

77-
For answers to common questions about this code of conduct, see
78-
https://www.contributor-covenant.org/faq
131+
For answers to common questions about this code of conduct, see the FAQ at
132+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
133+
[https://www.contributor-covenant.org/translations][translations].
134+
135+
[homepage]: https://www.contributor-covenant.org
136+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
137+
[Mozilla CoC]: https://github.com/mozilla/diversity
138+
[FAQ]: https://www.contributor-covenant.org/faq
139+
[translations]: https://www.contributor-covenant.org/translations

0 commit comments

Comments
 (0)