@@ -38,7 +38,7 @@ Tone of Voice
3838We don't expect you to be completely formal, or to even write error-free
3939English. Just remember this: don't swear, and be respectful to others.
4040
41- Don't reply in anger or with an aggressive tone. You 're angry, we understand
41+ Don't reply in anger or with an aggressive tone. If you 're angry, we understand
4242that, but swearing/cursing and name calling doesn't really encourage anyone to
4343help you. Take a deep breath, count to 10 and try to *clearly * explain what problems
4444you encounter.
@@ -149,6 +149,17 @@ you don't have to use "Please" all the time. But it wouldn't hurt.
149149It may not seem like much, but saying "Thank you" does make others feel
150150more welcome.
151151
152+
153+ Preventing Escalations
154+ ----------------------
155+
156+ Sometimes when people receive feedback they may get defensive.
157+ In that case, it is better to try to approach the discussion in
158+ a different way, to not escalate further.
159+
160+ If you want someone to mediate, please join the #contribs channel on `Symfony Slack `_,
161+ to have a safe environment and keep working together on the common goals.
162+
152163Using Humor
153164-----------
154165
@@ -176,3 +187,5 @@ But don't say it "just because", if your apology is not really meant
176187you *will * lose credibility and respect from other developers.
177188
178189*Do unto others as you would have them do unto you. *
190+
191+ .. _`Symfony Slack` : https://symfony.com/slack-invite
0 commit comments