Skip to content
This repository has been archived by the owner on Sep 30, 2020. It is now read-only.

Update the list of personal characteristics to synchronize with the Contributor's Covenant v1.3 #288

Merged
merged 3 commits into from
Jan 22, 2016
Merged

Update the list of personal characteristics to synchronize with the Contributor's Covenant v1.3 #288

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db1a0f8
Update the list of personal characteristics to synchronize with the
nikomatsakis Jan 21, 2016
ce3c3c9
Tweak wording to avoid repeating the word "personal" twice
nikomatsakis Jan 21, 2016
7189564
Credit the contributor's covenant as well
nikomatsakis Jan 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conduct.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ title: The Rust Code of Conduct · The Rust Programming Language

**Contact**: [[email protected]](mailto:[email protected])

* We are committed to providing a friendly, safe and welcoming environment for all, regardless of gender identity and expression, sexual orientation, disability, ethnicity, religion, or similar personal characteristic.
* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic.
* On IRC, please avoid using overtly sexual nicknames 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.
Expand All @@ -35,4 +35,4 @@ In the Rust community we strive to go the extra step to look out for each other.

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.

*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)*
*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](http://contributor-covenant.org/version/1/3/0/).*