From db1a0f888f757660151206db7496de3705f9c80d Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 21 Jan 2016 11:38:20 -0500 Subject: [PATCH 1/3] Update the list of personal characteristics to synchronize with the Contributor's Covenant v1.3, found at . --- conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conduct.md b/conduct.md index 87d753120..a02c9c4dc 100644 --- a/conduct.md +++ b/conduct.md @@ -9,7 +9,7 @@ title: The Rust Code of Conduct · The Rust Programming Language **Contact**: [rust-mods@rust-lang.org](mailto:rust-mods@rust-lang.org) -* 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 similar personal 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. From ce3c3c981e79990eaa7443bb99e49c4f8782af74 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 21 Jan 2016 12:02:05 -0500 Subject: [PATCH 2/3] Tweak wording to avoid repeating the word "personal" twice --- conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conduct.md b/conduct.md index a02c9c4dc..f9d0c3d87 100644 --- a/conduct.md +++ b/conduct.md @@ -9,7 +9,7 @@ title: The Rust Code of Conduct · The Rust Programming Language **Contact**: [rust-mods@rust-lang.org](mailto:rust-mods@rust-lang.org) -* 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 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. From 718956450fbe272176172b661f87f578e1187695 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 21 Jan 2016 12:02:15 -0500 Subject: [PATCH 3/3] Credit the contributor's covenant as well --- conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conduct.md b/conduct.md index f9d0c3d87..ab0f3e7d3 100644 --- a/conduct.md +++ b/conduct.md @@ -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/).*