summaryrefslogtreecommitdiff
path: root/CODE_OF_CONDUCT.md
diff options
context:
space:
mode:
authorJulie Pagano <julie.pagano@gmail.com>2016-02-05 12:33:31 -0800
committerJeremiah Senkpiel <fishrock123@rocketmail.com>2016-02-08 11:55:03 -0500
commit1e146e7c26be9add426f3cf92aa8c3d977de96e1 (patch)
tree3780ada04de212ca8037687328548d36bff8083f /CODE_OF_CONDUCT.md
parentdbdbdd4998e163deecefbb1d34cda84f749844a4 (diff)
downloadnode-new-1e146e7c26be9add426f3cf92aa8c3d977de96e1.tar.gz
doc: clarify code of conduct reporting
Clarifies the code of conduct by making the following changes: - Adds section headings to make it easier to quickly parse. - Adds easy to find contact information. - Adds link to TSC moderation policies. - Moves attribution to the bottom of the page. PR-URL: https://github.com/nodejs/node/pull/5107 Reviewed-By: Myles Borins <mborins@us.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Kat Marchán <kzm@sykosomatic.org> Reviewed-By: Evan Lucas <evanlucas@me.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'CODE_OF_CONDUCT.md')
-rw-r--r--CODE_OF_CONDUCT.md20
1 files changed, 17 insertions, 3 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 8dee836460..3d0f14d720 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,8 +1,6 @@
## Code of Conduct
-This Code of Conduct is adapted from [Rust's wonderful
-CoC](http://www.rust-lang.org/conduct.html) as well as the
-[Contributor Covenant v1.3.0](http://contributor-covenant.org/version/1/3/0/).
+### Conduct
* We are committed to providing a friendly, safe and welcoming
environment for all, regardless of level of experience, gender
@@ -39,3 +37,19 @@ CoC](http://www.rust-lang.org/conduct.html) as well as the
* Avoid the use of personal pronouns in code comments or
documentation. There is no need to address persons when explaining
code (e.g. "When the developer").
+
+### Contact
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by:
+
+* Emailing [report@nodejs.org](mailto:report@nodejs.org) (this will email all TSC members)
+* Contacting [individual TSC members](https://nodejs.org/en/foundation/tsc/#current-members-of-the-technical-steering-committee).
+
+### Moderation
+See the TSC's [moderation policy](https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md) for details about moderation.
+
+### Attribution
+
+This Code of Conduct is adapted from [Rust's wonderful
+CoC](http://www.rust-lang.org/conduct.html) as well as the
+[Contributor Covenant v1.3.0](http://contributor-covenant.org/version/1/3/0/).