From 518548f1d8f02787ee67f21eb3e7cccb4a79b711 Mon Sep 17 00:00:00 2001 From: Kat Marchán Date: Thu, 21 Jan 2016 11:17:01 -0800 Subject: doc: update list of personal traits in CoC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-By: Myles Borins Reviewed-By: James M Snell Reviewed-By: Сковорода Никита Андреевич PR-URL: https://github.com/nodejs/node/pull/4801 Fixes: https://github.com/nodejs/inclusivity/issues/82 --- CODE_OF_CONDUCT.md | 9 ++++++--- 1 file 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. -- cgit v1.2.3