Skip to content

Commit

Permalink
doc: update list of personal traits in CoC
Browse files Browse the repository at this point in the history
rust-lang/prev.rust-lang.org#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 nodejs/inclusivity#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: #4801
Fixes: nodejs/inclusivity#82
  • Loading branch information
zkat authored and rvagg committed Jan 25, 2016
1 parent 97eedfc commit 71ba14d
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down

0 comments on commit 71ba14d

Please sign in to comment.