summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshley Williams <ashley666ashley@gmail.com>2015-11-11 10:33:43 -0500
committerJames M Snell <jasnell@gmail.com>2015-11-12 11:22:16 -0800
commitd781cdc349973891030d2a46b72bb779a06aa7e0 (patch)
tree990131be988f4a84247afc8e8e6e0af5bfc3c5e8
parent7cb3a5427da2ecc0c119264e7456f88df96096b9 (diff)
downloadnode-new-d781cdc349973891030d2a46b72bb779a06aa7e0.tar.gz
docs: improve discoverability of Code of Conduct
- move CoC from CONTRIBUTING to top-level, separate COC file - add note/link in CONTRIBUTING - add note/link in README (both at top, and newcomer resources) - move CoC section in CONTRIBUTING to top of file PR-URL: https://github.com/nodejs/node/pull/3774 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
-rw-r--r--CODE_OF_CONDUCT.md36
-rw-r--r--CONTRIBUTING.md44
-rw-r--r--README.md3
3 files changed, 45 insertions, 38 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..b08bf7faa3
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,36 @@
+## Code of Conduct
+
+This Code of Conduct is adapted from [Rust's wonderful
+CoC](http://www.rust-lang.org/conduct.html).
+
+* We are committed to providing a friendly, safe and welcoming
+ environment for all, regardless of gender, sexual orientation,
+ disability, ethnicity, religion, or similar personal characteristic.
+* Please avoid using overtly sexual nicknames or other nicknames that
+ 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 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 behavior. We interpret the term
+ "harassment" as including the definition in the [Citizen Code of
+ Conduct](http://citizencodeofconduct.org/); 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 TSC members immediately with a capture (log, photo, email) of
+ the harassment if possible. 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 behavior is not welcome.
+* 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").
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8da5d14f8a..e78100bc81 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,11 @@
# Contributing to Node.js
+## Code of Conduct
+
+The Code of Conduct explains the *bare minimum* behavior
+expectations the Node Foundation requires of its contributors.
+[Please read it before participating.](./CODE_OF_CONDUCT.md)
+
## Issue Contributions
When opening new issues or commenting on existing issues on this repository
@@ -181,41 +187,3 @@ By making a contribution to this project, I certify that:
different license), as indicated in the file; or
* (c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified it.
-
-
-## Code of Conduct
-
-This Code of Conduct is adapted from [Rust's wonderful
-CoC](http://www.rust-lang.org/conduct.html).
-
-* We are committed to providing a friendly, safe and welcoming
- environment for all, regardless of gender, sexual orientation,
- disability, ethnicity, religion, or similar personal characteristic.
-* Please avoid using overtly sexual nicknames or other nicknames that
- 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 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 behavior. We interpret the term
- "harassment" as including the definition in the [Citizen Code of
- Conduct](http://citizencodeofconduct.org/); 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 TC members immediately with a capture (log, photo, email) of
- the harassment if possible. 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 behavior is not welcome.
-* 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").
diff --git a/README.md b/README.md
index 45062d459b..3c14da0439 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,8 @@ We intend to land, with increasing regularity, releases which are
compatible with the npm ecosystem that has been built to date for
Node.js.
+We also have a Code of Conduct. [Please read it.](./CODE_OF_CONDUCT.md)
+
## Download
Binaries, installers, and source tarballs are available at
@@ -307,6 +309,7 @@ Instructions:
## Resources for Newcomers
+* [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md)
* [CONTRIBUTING.md](./CONTRIBUTING.md)
* [GOVERNANCE.md](./GOVERNANCE.md)
* IRC: