From d9b17243d35aa7c4bc3cb3670a318faaa5d4d58f Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Thu, 24 Oct 2019 13:57:13 +0200 Subject: [PATCH 1/6] Move the examples of harassment to separate section in code of conduct This will make the Encouraged and Discouraged sections more balanced. The examples are from the Citizen Code of Conduct and would be good to clarify that to avoid the misunderstanding that these were based on incidents in our community. --- conduct.md | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/conduct.md b/conduct.md index 1d9e8d222..45d7951bb 100644 --- a/conduct.md +++ b/conduct.md @@ -33,19 +33,7 @@ As a member of the community, you agree to the following: - 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. - 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). -- We will exclude you from interaction if you insult, demean or harass anyone. Behavior that will lead to exclusion includes the following: - - Violence, threats of violence or violent language directed against another person. - - Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language. - - Posting or displaying sexually explicit or violent material. - - Posting or threatening to post other people’s personally identifying information ("doxing"). - - Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability. - - Inappropriate photography or recording. - - Inappropriate physical contact. You should have someone’s consent before touching them. - - Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances. - - Deliberate intimidation, stalking or following (online or in person). - - Advocating for, or encouraging, any of the above behavior. - - Sustained disruption of community events, including talks and presentations. - - In particular, we don’t tolerate behavior that excludes people in socially marginalized groups. +- We will exclude you from interaction if you insult, demean or harass anyone. See [examples of harassment](#examples-of-harassment) below. In particular, we don’t tolerate behavior that excludes people in socially marginalized groups. - 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. - Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome. @@ -106,6 +94,23 @@ listed above, * Sébastien Doeraene, Scala Center ([sebastien.doeraene@epfl.ch](mailto:sebastien.doeraene@epfl.ch)) * Kathleen Hayes, Lightbend ([kathleen.hayes@lightbend.com](mailto:kathleen.hayes@lightbend.com)) +### Examples of harassment + +The term “Harassment” includes “Unacceptable Behavior” described in the [Citizen Code of Conduct](http://citizencodeofconduct.org/). +Examples from that resource, but not based on events in our community: + +- Violence, threats of violence or violent language directed against another person. +- Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language. +- Posting or displaying sexually explicit or violent material. +- Posting or threatening to post other people’s personally identifying information ("doxing"). +- Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability. +- Inappropriate photography or recording. +- Inappropriate physical contact. You should have someone’s consent before touching them. +- Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances. +- Deliberate intimidation, stalking or following (online or in person). +- Advocating for, or encouraging, any of the above behavior. +- Sustained disruption of community events, including talks and presentations. + ### Credits Adapted from and/or inspired by multiple successful Codes of Conduct, including: From 8ff138f5c5462ad85fa76d3c1ce570b7489bc972 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Fri, 25 Oct 2019 12:25:36 +0200 Subject: [PATCH 2/6] change bullet list - to * --- conduct.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/conduct.md b/conduct.md index 45d7951bb..79b2605e4 100644 --- a/conduct.md +++ b/conduct.md @@ -99,17 +99,17 @@ listed above, The term “Harassment” includes “Unacceptable Behavior” described in the [Citizen Code of Conduct](http://citizencodeofconduct.org/). Examples from that resource, but not based on events in our community: -- Violence, threats of violence or violent language directed against another person. -- Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language. -- Posting or displaying sexually explicit or violent material. -- Posting or threatening to post other people’s personally identifying information ("doxing"). -- Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability. -- Inappropriate photography or recording. -- Inappropriate physical contact. You should have someone’s consent before touching them. -- Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances. -- Deliberate intimidation, stalking or following (online or in person). -- Advocating for, or encouraging, any of the above behavior. -- Sustained disruption of community events, including talks and presentations. +* Violence, threats of violence or violent language directed against another person. +* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language. +* Posting or displaying sexually explicit or violent material. +* Posting or threatening to post other people’s personally identifying information ("doxing"). +* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability. +* Inappropriate photography or recording. +* Inappropriate physical contact. You should have someone’s consent before touching them. +* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances. +* Deliberate intimidation, stalking or following (online or in person). +* Advocating for, or encouraging, any of the above behavior. +* Sustained disruption of community events, including talks and presentations. ### Credits From 76bfa936833f298cea6e41b890db9deda5500890 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 29 Oct 2019 19:29:26 +0100 Subject: [PATCH 3/6] revise intro to example points, as suggested by rkuhn --- conduct.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conduct.md b/conduct.md index 79b2605e4..09ee1b72a 100644 --- a/conduct.md +++ b/conduct.md @@ -96,8 +96,8 @@ listed above, ### Examples of harassment -The term “Harassment” includes “Unacceptable Behavior” described in the [Citizen Code of Conduct](http://citizencodeofconduct.org/). -Examples from that resource, but not based on events in our community: +Behavior that will lead to exclusion includes the following points, inspired by the definition of +“Unacceptable Behavior” in the [Citizen Code of Conduct](http://citizencodeofconduct.org/): * Violence, threats of violence or violent language directed against another person. * Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language. From 463ab9f200f99dd6066b9f1bef1572a755aac5c2 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 29 Oct 2019 19:32:46 +0100 Subject: [PATCH 4/6] rename to Examples of unacceptable behavior, suggested by rkuhn --- conduct.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conduct.md b/conduct.md index 09ee1b72a..21ef2a292 100644 --- a/conduct.md +++ b/conduct.md @@ -33,7 +33,7 @@ As a member of the community, you agree to the following: - 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. - 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). -- We will exclude you from interaction if you insult, demean or harass anyone. See [examples of harassment](#examples-of-harassment) below. In particular, we don’t tolerate behavior that excludes people in socially marginalized groups. +- 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. - 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. - Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome. @@ -94,7 +94,7 @@ listed above, * Sébastien Doeraene, Scala Center ([sebastien.doeraene@epfl.ch](mailto:sebastien.doeraene@epfl.ch)) * Kathleen Hayes, Lightbend ([kathleen.hayes@lightbend.com](mailto:kathleen.hayes@lightbend.com)) -### Examples of harassment +### Examples of unacceptable behavior Behavior that will lead to exclusion includes the following points, inspired by the definition of “Unacceptable Behavior” in the [Citizen Code of Conduct](http://citizencodeofconduct.org/): From cebfbbe2d9669eb947e08299e9e35b2d91b8fc54 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 29 Oct 2019 19:38:12 +0100 Subject: [PATCH 5/6] adjust point about marginalized groups, as suggested by rkuhn --- conduct.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conduct.md b/conduct.md index 21ef2a292..c6530c0a8 100644 --- a/conduct.md +++ b/conduct.md @@ -33,7 +33,8 @@ As a member of the community, you agree to the following: - 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. - 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). -- 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. +- We will exclude you from interaction if you insult, demean or harass anyone. See [examples of unacceptable behavior](#examples-of-unacceptable-behavior) below. +- We don’t tolerate behavior that excludes people based on their association with social, ethnic, religious, political, or similar groups. - 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. - Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome. From 06097446463120ef238a3d65910e74d833185f72 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 29 Oct 2019 20:12:30 +0100 Subject: [PATCH 6/6] Revert "adjust point about marginalized groups, as suggested by rkuhn" This reverts commit cebfbbe2d9669eb947e08299e9e35b2d91b8fc54. --- conduct.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conduct.md b/conduct.md index c6530c0a8..21ef2a292 100644 --- a/conduct.md +++ b/conduct.md @@ -33,8 +33,7 @@ As a member of the community, you agree to the following: - 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. - 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). -- We will exclude you from interaction if you insult, demean or harass anyone. See [examples of unacceptable behavior](#examples-of-unacceptable-behavior) below. -- We don’t tolerate behavior that excludes people based on their association with social, ethnic, religious, political, or similar groups. +- 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. - 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. - Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.