Skip to content

Commit c5d69f0

Browse files
authored
Merge pull request #734 from VividLemon/master
docs: contributor covenant v2.1 revision
2 parents 1f6d6c3 + db032f8 commit c5d69f0

File tree

1 file changed

+34
-32
lines changed

1 file changed

+34
-32
lines changed

CODE_OF_CONDUCT.md

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ We as members, contributors, and leaders pledge to make participation in our
66
community a harassment-free experience for everyone, regardless of age, body
77
size, visible or invisible disability, ethnicity, sex characteristics, gender
88
identity and expression, level of experience, education, socio-economic status,
9-
nationality, personal appearance, race, religion, or sexual identity
10-
and orientation.
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
1111

1212
We pledge to act and interact in ways that contribute to an open, welcoming,
1313
diverse, inclusive, and healthy community.
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
1717
Examples of behavior that contributes to a positive environment for our
1818
community include:
1919

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,
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,
2424
and learning from the experience
25-
- Focusing on what is best not just for us as individuals, but for the
26-
overall community
25+
* Focusing on what is best not just for us as individuals, but for the overall
26+
community
2727

2828
Examples of unacceptable behavior include:
2929

30-
- The use of sexualized language or imagery, and sexual attention or
31-
advances of any kind
32-
- Trolling, insulting or derogatory comments, and personal or political attacks
33-
- Public or private harassment
34-
- Publishing others' private information, such as a physical or email
35-
address, without their explicit permission
36-
- Other conduct which could reasonably be considered inappropriate in a
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
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
3737
professional setting
3838

3939
## Enforcement Responsibilities
@@ -58,9 +58,7 @@ representative at an online or offline event.
5858

5959
## Enforcement
6060

61-
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62-
reported to the community leaders responsible for enforcement at
63-
.
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders via a GitHub issue. Please create an issue there commenting that there is a complaint, **but do not include details of the event**. Then a community leader will give the reporter details on a preferred private contact method to respect the privacy of the reporter. No matter the chosen forum to privately handle the situation, the community leader agrees to act on behalf of the organization.
6462
All complaints will be reviewed and investigated promptly and fairly.
6563

6664
All community leaders are obligated to respect the privacy and security of the
@@ -82,15 +80,15 @@ behavior was inappropriate. A public apology may be requested.
8280

8381
### 2. Warning
8482

85-
**Community Impact**: A violation through a single incident or series
86-
of actions.
83+
**Community Impact**: A violation through a single incident or series of
84+
actions.
8785

8886
**Consequence**: A warning with consequences for continued behavior. No
8987
interaction with the people involved, including unsolicited interaction with
9088
those enforcing the Code of Conduct, for a specified period of time. This
9189
includes avoiding interactions in community spaces as well as external channels
92-
like social media. Violating these terms may lead to a temporary or
93-
permanent ban.
90+
like social media. Violating these terms may lead to a temporary or permanent
91+
ban.
9492

9593
### 3. Temporary Ban
9694

@@ -109,20 +107,24 @@ Violating these terms may lead to a permanent ban.
109107
standards, including sustained inappropriate behavior, harassment of an
110108
individual, or aggression toward or disparagement of classes of individuals.
111109

112-
**Consequence**: A permanent ban from any sort of public interaction within
113-
the community.
110+
**Consequence**: A permanent ban from any sort of public interaction within the
111+
community.
114112

115113
## Attribution
116114

117115
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118-
version 2.0, available at
119-
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
116+
version 2.1, available at
117+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
120118

121-
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122-
enforcement ladder](https://github.com/mozilla/diversity).
123-
124-
[homepage]: https://www.contributor-covenant.org
119+
Community Impact Guidelines were inspired by
120+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
125121

126122
For answers to common questions about this code of conduct, see the FAQ at
127-
https://www.contributor-covenant.org/faq. Translations are available at
128-
https://www.contributor-covenant.org/translations.
123+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
124+
[https://www.contributor-covenant.org/translations][translations].
125+
126+
[homepage]: https://www.contributor-covenant.org
127+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
128+
[Mozilla CoC]: https://github.com/mozilla/diversity
129+
[FAQ]: https://www.contributor-covenant.org/faq
130+
[translations]: https://www.contributor-covenant.org/translations

0 commit comments

Comments
 (0)