summaryrefslogtreecommitdiffstats
path: root/CODE_OF_CONDUCT.md
diff options
context:
space:
mode:
authorDavid Alber <alber.david@gmail.com>2018-03-07 08:57:26 -0800
committerDavid Alber <alber.david@gmail.com>2018-03-07 08:58:57 -0800
commitca1c91bc653caa2c51d70a0f9ed81dd364da1a5f (patch)
treedf975f615f7eb967bc20e7e3ba24f18b8eb0718c /CODE_OF_CONDUCT.md
parentAuto merge of #48642 - alexcrichton:compile-cargo-once, r=michaelwoerister (diff)
downloadgrust-ca1c91bc653caa2c51d70a0f9ed81dd364da1a5f.tar.gz
grust-ca1c91bc653caa2c51d70a0f9ed81dd364da1a5f.tar.bz2
grust-ca1c91bc653caa2c51d70a0f9ed81dd364da1a5f.tar.xz
Synchronizing with code of conduct in rust-www
This is propagated from rust-lang/rust-www#1062.
Diffstat (limited to 'CODE_OF_CONDUCT.md')
-rw-r--r--CODE_OF_CONDUCT.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index e9b39717c7..d70b2b52ac 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -11,9 +11,9 @@ A version of this document [can be found online](https://www.rust-lang.org/condu
11* Please be kind and courteous. There's no need to be mean or rude. 11* Please be kind and courteous. There's no need to be mean or rude.
12* 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. 12* 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.
13* 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. 13* 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.
14* 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 <a href="http://citizencodeofconduct.org/">Citizen Code of Conduct</a>; 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. 14* 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 <a href="http://citizencodeofconduct.org/">Citizen Code of Conduct</a>; 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.
15* 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. 15* 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.
16* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome. 16* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
17 17
18## Moderation 18## Moderation
19 19