From 1f7cdbd4ceed98a97419620ebd9608487f9f5256 Mon Sep 17 00:00:00 2001 From: stefee Date: Wed, 19 Aug 2020 20:25:58 +0100 Subject: [PATCH] Update CODE_OF_CONDUCT.md * Remove 'when something happens' section * Add pledge from Contributor Covenant version 2.0 --- CODE_OF_CONDUCT.md | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 4c00df943185c..5774b6aad45a9 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,27 +1,19 @@ # Code of Conduct -_This Code of Conduct is based on the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), which is adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant version 1.3](https://www.contributor-covenant.org/version/1/3/0/code-of-conduct/)._ +_This Code of Conduct is based on the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), which is adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) and the [Contributor Covenant](https://www.contributor-covenant.org)._ -## When something happens +## Our Pledge -If you see a violation of our community's standards of [Conduct](#conduct), follow these steps: +We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation. -1. Let the person know that what they did is not appropriate and ask them to stop and/or edit their messages. -2. That person should immediately stop the behavior and correct the issue. -3. If this doesn’t happen, or if you're uncomfortable speaking up, contact the maintainers. -4. As soon as available, a maintainer will look into the issue, and take further action, starting with a warning, then temporary block, then long-term repo or organization ban. +We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community. -When reporting, please include any relevant details, links, screenshots, context, or other information that may be used to better understand and resolve the situation. - -The maintainers will prioritize the well-being and comfort of the recipients of the violation over the comfort of the violator. - -## Conduct +## Our Standards In this community we strive to go the extra step to look out for each other. Don’t just aim to be technically unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues, particularly if they’re off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can drive people away from the community entirely. And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could’ve communicated better — remember that it’s your responsibility to make your fellow Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust. -* We are committed to providing a friendly, safe and harassment-free environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic. * Please avoid using overtly sexual aliases or other nicknames that might detract from a friendly, safe and welcoming environment for all. * Please be kind and courteous. There’s no need to be mean or rude. * Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer. @@ -33,15 +25,15 @@ And if someone takes issue with something you said or did, resist the urge to be ## Moderation -These are the policies for upholding our community’s standards of [Conduct](#conduct). If you feel that a thread needs moderation, please contact the maintainers. +These are the policies for upholding [our community’s standards of conduct](#our-standards). If you feel that a thread needs moderation, please contact the maintainers. 1. Remarks that violate the community standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner). -2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed. -3. Moderators will first respond to such remarks with a warning. +2. Remarks that maintainers find inappropriate, whether listed in the code of conduct or not, are also not allowed. +3. Maintainers will first respond to such remarks with a warning. 4. If the warning is unheeded, the user will be “kicked,” i.e., kicked out of the communication channel to cool off. 5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded. -6. Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology. -7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a different moderator, in private. Complaints about bans in-channel are not allowed. -8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate situation, they should expect less leeway than others. +6. Maintainers may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology. +7. If a maintainer bans someone and you think it was unjustified, please take it up with that maintainer, or with a different maintainer, in private. Complaints about bans in-channel are not allowed. +8. Maintainers are held to a higher standard than other community members. If a maintainer creates an inappropriate situation, they should expect less leeway than others. The enforcement policies in the code of conduct apply to all official venues, including Discord channels, GitHub repositories, the Twitter community and all other forums.