From 1e03a8c5651f6ec9b5e78b1258951ed983f6a206 Mon Sep 17 00:00:00 2001 From: Danielle Pham Date: Mon, 5 Mar 2018 23:59:55 -0500 Subject: [PATCH] Use American spelling of behavior in en-US --- en-US/conduct.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en-US/conduct.md b/en-US/conduct.md index a3678911c..27fe6cfff 100644 --- a/en-US/conduct.md +++ b/en-US/conduct.md @@ -14,9 +14,9 @@ title: The Rust Code of Conduct · The Rust Programming Language * 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. * Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works. -* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behaviour. We interpret the term "harassment" as including the definition in the Citizen Code of Conduct; if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups. +* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term "harassment" as including the definition in the Citizen Code of Conduct; if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups. * Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the [Rust moderation team][mod_team] immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back. -* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome. +* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome. ## Moderation