about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-10-21 09:47:24 -0400
committerGitHub <noreply@github.com>2017-10-21 09:47:24 -0400
commitd86c5d00a248d069abe015163261d4cff3e8cd3d (patch)
treef1816fe350baa0bedd25401b30f604ebf5a039c9
parentc96db06e5beb6b9de8e5701f57f83e9ca1348194 (diff)
parent34c0de2067b132c8d68689501604d4fffbe9fba8 (diff)
downloadrust-d86c5d00a248d069abe015163261d4cff3e8cd3d.tar.gz
rust-d86c5d00a248d069abe015163261d4cff3e8cd3d.zip
Rollup merge of #45418 - Manishearth:update-coc, r=aturon
Remove "gender" from code of conduct, keep only "gender identity and expression"

Mirrors https://github.com/rust-lang/rust-www/pull/954 . See that pull
request for motivation.
-rw-r--r--CODE_OF_CONDUCT.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 6bec9330186..d42476bc413 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -6,7 +6,7 @@ A version of this document [can be found online](https://www.rust-lang.org/condu
 
 **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 other similar characteristic.
+* We are committed to providing a friendly, safe and welcoming 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.
 * 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.