diff options
| author | Kat Marchán <kzm@sykosomatic.org> | 2016-01-21 11:17:01 -0800 |
|---|---|---|
| committer | Kat Marchán <kzm@sykosomatic.org> | 2016-01-22 13:36:01 -0800 |
| commit | 518548f1d8f02787ee67f21eb3e7cccb4a79b711 (patch) | |
| tree | fe411531f38282c3a51dd5f7709199bb04aedfa9 /CODE_OF_CONDUCT.md | |
| parent | 4e1023d6b49efe03c24780b5a17fa27987f5bd4e (diff) | |
| download | android-node-v8-518548f1d8f02787ee67f21eb3e7cccb4a79b711.tar.gz android-node-v8-518548f1d8f02787ee67f21eb3e7cccb4a79b711.tar.bz2 android-node-v8-518548f1d8f02787ee67f21eb3e7cccb4a79b711.zip | |
doc: update list of personal traits in CoC
https://github.com/rust-lang/rust-www/pull/288 landed in the Rust repo
so it seems like a good idea to just bring the updated list in.
We also received a request to do this in https://github.com/nodejs/inclusivity/issues/82
so this should resolve that.
Thanks to [@Charlotteis](https://github.com/Charlotteis) for bringing
up the original issue.
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Myles Borins <mborins@us.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/4801
Fixes: https://github.com/nodejs/inclusivity/issues/82
Diffstat (limited to 'CODE_OF_CONDUCT.md')
| -rw-r--r-- | CODE_OF_CONDUCT.md | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 015c2b9d69..8dee836460 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,11 +1,14 @@ ## Code of Conduct This Code of Conduct is adapted from [Rust's wonderful -CoC](http://www.rust-lang.org/conduct.html). +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/). * 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. + environment for all, regardless of level of experience, gender + identity and expression, sexual orientation, disability, + personal appearance, body size, race, ethnicity, age, religion, + nationality, or other similar characteristic. * Please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all. |