Skip to content

Commit 11848db

Browse files
authored
Merge pull request #1087 from patriknw/wip-conduct-examples
Move the examples of harassment to separate section in code of conduct
2 parents 9e6d2a3 + 0609744 commit 11848db

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

conduct.md

+18-13
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,7 @@ As a member of the community, you agree to the following:
3333

3434
- Keep unstructured critique to a minimum. We encourage sharing ideas and perspectives, so please ensure that your feedback is constructive and relevant. If you have solid ideas you want to experiment with, make a fork and see how it works.
3535
- Avoid aggressive and micro-aggressive behavior, such as unconstructive criticism, providing corrections that do not improve the conversation (sometimes referred to as "well actually"s), repeatedly interrupting or talking over someone else, feigning surprise at someone’s lack of knowledge or awareness about a topic, or subtle prejudice (for example, comments like “That’s so easy my grandmother could do it.”). For more examples of this kind of behavior, [see the Recurse Center's user manual](https://www.recurse.com/manual#sec-environment).
36-
- We will exclude you from interaction if you insult, demean or harass anyone. Behavior that will lead to exclusion includes the following:
37-
- Violence, threats of violence or violent language directed against another person.
38-
- Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
39-
- Posting or displaying sexually explicit or violent material.
40-
- Posting or threatening to post other people’s personally identifying information ("doxing").
41-
- Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
42-
- Inappropriate photography or recording.
43-
- Inappropriate physical contact. You should have someone’s consent before touching them.
44-
- Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
45-
- Deliberate intimidation, stalking or following (online or in person).
46-
- Advocating for, or encouraging, any of the above behavior.
47-
- Sustained disruption of community events, including talks and presentations.
48-
- In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.
36+
- We will exclude you from interaction if you insult, demean or harass anyone. See [examples of unacceptable behavior](#examples-of-unacceptable-behavior) below. In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.
4937
- Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member's behavior, please [contact the moderation team](#contact) immediately.
5038
- Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
5139

@@ -106,6 +94,23 @@ listed above,
10694
* Sébastien Doeraene, Scala Center ([[email protected]](mailto:[email protected]))
10795
* Kathleen Hayes, Lightbend ([[email protected]](mailto:[email protected]))
10896

97+
### Examples of unacceptable behavior
98+
99+
Behavior that will lead to exclusion includes the following points, inspired by the definition of
100+
“Unacceptable Behavior” in the [Citizen Code of Conduct](http://citizencodeofconduct.org/):
101+
102+
* Violence, threats of violence or violent language directed against another person.
103+
* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
104+
* Posting or displaying sexually explicit or violent material.
105+
* Posting or threatening to post other people’s personally identifying information ("doxing").
106+
* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
107+
* Inappropriate photography or recording.
108+
* Inappropriate physical contact. You should have someone’s consent before touching them.
109+
* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
110+
* Deliberate intimidation, stalking or following (online or in person).
111+
* Advocating for, or encouraging, any of the above behavior.
112+
* Sustained disruption of community events, including talks and presentations.
113+
109114
### Credits
110115

111116
Adapted from and/or inspired by multiple successful Codes of Conduct, including:

0 commit comments

Comments
 (0)