Skip to content

Commit db5ca24

Browse files
TimoBakxjaviereguiluz
TimoBakx
authored and
javiereguiluz
committed
Updated Code of Conduct text to version 2.1 of the Contributor Covenant
1 parent 300cf43 commit db5ca24

File tree

3 files changed

+95
-138
lines changed

3 files changed

+95
-138
lines changed

‎.github/CODE_OF_CONDUCT.md

-12
This file was deleted.

‎CODE_OF_CONDUCT.md

-83
This file was deleted.

‎contributing/code_of_conduct/code_of_conduct.rst

+95-43
Original file line numberDiff line numberDiff line change
@@ -4,80 +4,131 @@ Code of Conduct
44
Our Pledge
55
----------
66

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

1417
Our Standards
1518
-------------
1619

1720
Examples of behavior that contributes to creating a positive environment
1821
include:
1922

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

26-
Examples of unacceptable behavior by participants include:
31+
Examples of unacceptable behavior include:
2732

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

3742
Our Responsibilities
3843
--------------------
3944

40-
:doc:`CoC Active Response Ensurers, or CARE </contributing/code_of_conduct/care_team>`,
41-
are responsible for clarifying the standards of acceptable
42-
behavior and are expected to take appropriate and fair corrective action in
43-
response to any instances of unacceptable behavior.
45+
:doc:`CoC Active Response Ensurers (CARE) team members </contributing/code_of_conduct/care_team>`
46+
are responsible for clarifying and enforcing our standards of acceptable
47+
behavior and will take appropriate and fair corrective action in response to any
48+
behavior that they deem inappropriate, threatening, offensive, or harmful.
4449

45-
CARE team members have the right and responsibility to remove, edit, or
46-
reject comments, commits, code, wiki edits, issues, and other contributions
47-
that are not aligned to this Code of Conduct, or to ban temporarily or
48-
permanently any contributor for other behaviors that they deem inappropriate,
49-
threatening, offensive, or harmful.
50+
CARE team members have the right and responsibility to remove, edit, or reject
51+
comments, commits, code, wiki edits, issues, and other contributions that are
52+
not aligned to this Code of Conduct, and will communicate reasons for moderation
53+
decisions when appropriate.
5054

5155
Scope
5256
-----
5357

54-
This Code of Conduct applies both within project spaces and in public spaces
55-
when an individual is representing the project or its community. Examples of
56-
representing a project or community include using an official project email
57-
address, posting via an official social media account, or acting as an appointed
58-
representative at an online or offline event. Representation of a project may be
59-
further defined and clarified by CARE team members.
58+
This Code of Conduct applies within all community spaces, and also applies when
59+
an individual is officially representing the community in public spaces.
60+
Examples of representing our community include using an official e-mail address,
61+
posting via an official social media account, or acting as an appointed
62+
representative at an online or offline event.
6063

6164
Enforcement
6265
-----------
6366

6467
Instances of abusive, harassing, or otherwise unacceptable behavior
65-
:doc:`may be reported </contributing/code_of_conduct/reporting_guidelines>`
66-
by contacting the :doc:`CARE team members </contributing/code_of_conduct/care_team>`.
67-
All complaints will be reviewed and investigated and will result in a response that
68-
is deemed necessary and appropriate to the circumstances. The CARE team is
69-
obligated to maintain confidentiality with regard to the reporter of an incident.
70-
Further details of specific enforcement policies may be posted separately.
68+
:doc:`may be reported </contributing/code_of_conduct/reporting_guidelines>` by
69+
contacting the :doc:`CARE team members </contributing/code_of_conduct/care_team>`.
70+
All complaints will be reviewed and investigated promptly and fairly.
71+
72+
CARE team members are obligated to respect the privacy and security of the
73+
reporter of any incident.
74+
75+
Enforcement Guidelines
76+
----------------------
77+
78+
The :doc:`CARE team members </contributing/code_of_conduct/care_team>` will
79+
follow these Community Impact Guidelines in determining the consequences for any
80+
action they deem in violation of this Code of Conduct:
81+
82+
1. Correction
83+
~~~~~~~~~~~~~
84+
85+
Community Impact: Use of inappropriate language or other behavior deemed
86+
unprofessional or unwelcome in the community.
87+
88+
Consequence: A private, written warning from a CARE team member, providing
89+
clarity around the nature of the violation and an explanation of why the
90+
behavior was inappropriate. A public apology may be requested.
91+
92+
2. Warning
93+
~~~~~~~~~~
7194

72-
CARE team members who do not follow or enforce the Code of Conduct in good
73-
faith may face temporary or permanent repercussions as determined by the
74-
:doc:`core team </contributing/code/core_team>`.
95+
Community Impact: A violation through a single incident or series of actions.
96+
97+
Consequence: A warning with consequences for continued behavior. No interaction
98+
with the people involved, including unsolicited interaction with those enforcing
99+
the Code of Conduct, for a specified period of time. This includes avoiding
100+
interactions in community spaces as well as external channels like social media.
101+
Violating these terms may lead to a temporary or permanent ban.
102+
103+
3. Temporary Ban
104+
~~~~~~~~~~~~~~~~
105+
106+
Community Impact: A serious violation of community standards, including
107+
sustained inappropriate behavior.
108+
109+
Consequence: A temporary ban from any sort of interaction or public
110+
communication with the community for a specified period of time. No public or
111+
private interaction with the people involved, including unsolicited interaction
112+
with those enforcing the Code of Conduct, is allowed during this period.
113+
Violating these terms may lead to a permanent ban.
114+
115+
4. Permanent Ban
116+
~~~~~~~~~~~~~~~~
117+
118+
Community Impact: Demonstrating a pattern of violation of community standards,
119+
including sustained inappropriate behavior, harassment of an individual, or
120+
aggression toward or disparagement of classes of individuals.
121+
122+
Consequence: A permanent ban from any sort of public interaction within the
123+
community.
75124

76125
Attribution
77126
-----------
78127

79-
This Code of Conduct is adapted from the `Contributor Covenant`_, version 1.4,
80-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct/
128+
This Code of Conduct is adapted from the `Contributor Covenant`_, version 2.1,
129+
available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
130+
131+
Community Impact Guidelines were inspired by `Mozilla’s code of conduct enforcement ladder`_.
81132

82133
Related Documents
83134
-----------------
@@ -90,3 +141,4 @@ Related Documents
90141
concrete_example_document
91142

92143
.. _Contributor Covenant: https://www.contributor-covenant.org
144+
.. _Mozilla’s code of conduct enforcement ladder: https://github.com/mozilla/diversity

0 commit comments

Comments
 (0)