From bf4bb7d537911ae29da0e6f6d9128977f5f5ec41 Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Sun, 27 Oct 2019 15:26:41 +0100 Subject: [PATCH 1/6] Revamp CoC preamble and encouraged section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make the language more positive and talk to the reader in a friendly voice. Also move the anti-discrimination list out of the preamble and into the text, as having it in the preamble feels very confrontative (“legalese”) to newcomers. --- conduct.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/conduct.md b/conduct.md index 1d9e8d222..3aa4dcb7b 100644 --- a/conduct.md +++ b/conduct.md @@ -10,11 +10,8 @@ redirect_from: ## Scala Code of Conduct -We are committed to providing a friendly, safe and welcoming environment for -all, regardless of age, body size, disability, ethnicity, sex characteristics, -gender identity and expression, level of experience, education, socio-economic -status, nationality, personal appearance, race, religion, sexual identity -and orientation, or other such characteristics. +We are committed to providing a friendly, safe and welcoming environment. +We expect the following standards to be observed and upheld by all participants in any community forum (Discuss, GitHub, gitter, etc.). ### Our Standards @@ -24,10 +21,9 @@ As a member of the community, you agree to the following: **Encouraged:** -- Be kind and courteous. -- Respect differences of opinion and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer. -- Remember that everyone was new to Scala at some point. We want to encourage newcomers to join our community and learn the Scala language and ecosystem. Assume competence. -- Show empathy towards other community members. +- **Be kind and courteous.** Keep in mind that all public communication is received by many people you don’t know, so please ask yourself whether someone from a different context would misunderstand your message before sending it. Do not attack other persons, in particular consider that age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion have no bearing on the respect you owe another person. +- **Respect differences of opinion** and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer, we will find the best solutions by engaging in constructive discussion, with everybody bringing their unique viewpoint and experience to the table. +- **Remember that everyone was new to Scala at some point.** We want to encourage newcomers to join our community and learn the Scala language and ecosystem. Always assume good intentions and a willingness to learn, just as you are willing to evolve your own opinion as you gain new insights. **Discouraged:** From 7144d372339f0617b1257b491918c36d427b22df Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Sun, 27 Oct 2019 16:19:39 +0100 Subject: [PATCH 2/6] =?UTF-8?q?remove=20ambiguous=20term=20=E2=80=9Cmicro-?= =?UTF-8?q?aggressive=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conduct.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conduct.md b/conduct.md index 3aa4dcb7b..9d7217da5 100644 --- a/conduct.md +++ b/conduct.md @@ -21,14 +21,14 @@ As a member of the community, you agree to the following: **Encouraged:** -- **Be kind and courteous.** Keep in mind that all public communication is received by many people you don’t know, so please ask yourself whether someone from a different context would misunderstand your message before sending it. Do not attack other persons, in particular consider that age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion have no bearing on the respect you owe another person. +- **Be kind and courteous.** Keep in mind that all public communication is received by many people you don’t know, so before sending a message please ask yourself whether someone from a different context would misunderstand it. Do not attack other persons, in particular consider that age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, or religion have no bearing on the respect you owe another person. - **Respect differences of opinion** and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer, we will find the best solutions by engaging in constructive discussion, with everybody bringing their unique viewpoint and experience to the table. - **Remember that everyone was new to Scala at some point.** We want to encourage newcomers to join our community and learn the Scala language and ecosystem. Always assume good intentions and a willingness to learn, just as you are willing to evolve your own opinion as you gain new insights. **Discouraged:** - 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). +- Avoid 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. From c726e88368f02fe760dc9e0fad1efcd0d5b575e2 Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Wed, 30 Oct 2019 21:49:34 +0100 Subject: [PATCH 3/6] improve CoC based on PR feedback --- conduct.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conduct.md b/conduct.md index 9d7217da5..955a3d3d5 100644 --- a/conduct.md +++ b/conduct.md @@ -11,7 +11,7 @@ redirect_from: ## Scala Code of Conduct We are committed to providing a friendly, safe and welcoming environment. -We expect the following standards to be observed and upheld by all participants in any community forum (Discuss, GitHub, gitter, etc.). +We expect the following standards to be observed and upheld by all participants in any community forum, be that online or offline. ### Our Standards @@ -21,12 +21,13 @@ As a member of the community, you agree to the following: **Encouraged:** -- **Be kind and courteous.** Keep in mind that all public communication is received by many people you don’t know, so before sending a message please ask yourself whether someone from a different context would misunderstand it. Do not attack other persons, in particular consider that age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, or religion have no bearing on the respect you owe another person. -- **Respect differences of opinion** and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer, we will find the best solutions by engaging in constructive discussion, with everybody bringing their unique viewpoint and experience to the table. +- **Be kind and courteous.** We treat our fellow community members with the respect and dignity all humans deserve. Keep in mind that public communication is received by many people you don’t know, so before sending a message please ask yourself whether someone from a different context would misunderstand it. +- **Respect differences of opinion** and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer; we will find the best solutions by engaging in constructive discussion, with everybody bringing their unique viewpoint and experience to the table. - **Remember that everyone was new to Scala at some point.** We want to encourage newcomers to join our community and learn the Scala language and ecosystem. Always assume good intentions and a willingness to learn, just as you are willing to evolve your own opinion as you gain new insights. **Discouraged:** +- Do not exclude people or reject their contributions based on age, body size, disability, ethnicity, sex characteristics, sexuality, gender, level of experience, education, socio-economic status, nationality, personal appearance, race, or religion. - 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 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: From a9f90f908bafcfd9108dad9195976b0ce3321c4a Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Wed, 30 Oct 2019 21:55:57 +0100 Subject: [PATCH 4/6] add empathy to kindness and courtesy --- conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conduct.md b/conduct.md index 955a3d3d5..0f16760ad 100644 --- a/conduct.md +++ b/conduct.md @@ -21,7 +21,7 @@ As a member of the community, you agree to the following: **Encouraged:** -- **Be kind and courteous.** We treat our fellow community members with the respect and dignity all humans deserve. Keep in mind that public communication is received by many people you don’t know, so before sending a message please ask yourself whether someone from a different context would misunderstand it. +- **Be kind and courteous.** We treat our fellow community members with the empathy, respect and dignity all humans deserve. Keep in mind that public communication is received by many people you don’t know, so before sending a message please ask yourself whether someone from a different context would misunderstand it. - **Respect differences of opinion** and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer; we will find the best solutions by engaging in constructive discussion, with everybody bringing their unique viewpoint and experience to the table. - **Remember that everyone was new to Scala at some point.** We want to encourage newcomers to join our community and learn the Scala language and ecosystem. Always assume good intentions and a willingness to learn, just as you are willing to evolve your own opinion as you gain new insights. From 2a01c5c4227ae1e8408451b8e6f00a1b0f2083e7 Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Sat, 2 Nov 2019 10:12:03 +0100 Subject: [PATCH 5/6] Improve intro to behaviors to avoid and revert discrimination list --- conduct.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conduct.md b/conduct.md index 0f16760ad..a6ce1944f 100644 --- a/conduct.md +++ b/conduct.md @@ -27,9 +27,9 @@ As a member of the community, you agree to the following: **Discouraged:** -- Do not exclude people or reject their contributions based on age, body size, disability, ethnicity, sex characteristics, sexuality, gender, level of experience, education, socio-economic status, nationality, personal appearance, race, or religion. +- Do not exclude people or reject their contributions based on age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, sexual identity and orientation, or other such characteristics. - 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 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). +- Avoid behaviors that lead to strife and tension, 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. From 16a077107e042e3847e2e478bcb3c093e76b663e Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Wed, 6 Nov 2019 21:40:52 +0100 Subject: [PATCH 6/6] revert contentious changes, postponed to follow-up PR --- conduct.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/conduct.md b/conduct.md index a6ce1944f..377a3f242 100644 --- a/conduct.md +++ b/conduct.md @@ -10,8 +10,11 @@ redirect_from: ## Scala Code of Conduct -We are committed to providing a friendly, safe and welcoming environment. -We expect the following standards to be observed and upheld by all participants in any community forum, be that online or offline. +We are committed to providing a friendly, safe and welcoming environment for +all, regardless of age, body size, disability, ethnicity, sex characteristics, +gender identity and expression, level of experience, education, socio-economic +status, nationality, personal appearance, race, religion, sexual identity +and orientation, or other such characteristics. ### Our Standards @@ -27,9 +30,8 @@ As a member of the community, you agree to the following: **Discouraged:** -- Do not exclude people or reject their contributions based on age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, sexual identity and orientation, or other such characteristics. - 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 behaviors that lead to strife and tension, 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). +- 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.