Skip to content

Commit bf4bb7d

Browse files
authored
Revamp CoC preamble and encouraged section
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.
1 parent eb2cacf commit bf4bb7d

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

conduct.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ redirect_from:
1010

1111
## Scala Code of Conduct
1212

13-
We are committed to providing a friendly, safe and welcoming environment for
14-
all, regardless of age, body size, disability, ethnicity, sex characteristics,
15-
gender identity and expression, level of experience, education, socio-economic
16-
status, nationality, personal appearance, race, religion, sexual identity
17-
and orientation, or other such characteristics.
13+
We are committed to providing a friendly, safe and welcoming environment.
14+
We expect the following standards to be observed and upheld by all participants in any community forum (Discuss, GitHub, gitter, etc.).
1815

1916
### Our Standards
2017

@@ -24,10 +21,9 @@ As a member of the community, you agree to the following:
2421

2522
**Encouraged:**
2623

27-
- Be kind and courteous.
28-
- 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.
29-
- 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.
30-
- Show empathy towards other community members.
24+
- **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.
25+
- **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.
26+
- **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.
3127

3228
**Discouraged:**
3329

0 commit comments

Comments
 (0)