From: James M Snell <jasnell@gmail.com>
Date: Sat, 14 Nov 2015 23:53:05 +0000 (-0800)
Subject: doc: address use of profanity in code of conduct
X-Git-Tag: v4.2.4~71
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5375a19b749d4f246b75973fa6f063a13dff2577;p=platform%2Fupstream%2Fnodejs.git

doc: address use of profanity in code of conduct

PR-URL: https://github.com/nodejs/node/pull/3827
Reviewed-By: Brian White <mscdex@mscdex.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
---

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index b08bf7f..015c2b9 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -10,6 +10,8 @@ CoC](http://www.rust-lang.org/conduct.html).
   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 some individuals and cultures consider the casual use of
+  profanity offensive and off-putting.
 * 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.