From 0554ec13e8b17c29f03a38d8d0d3124ad1564ef7 Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Tue, 11 Apr 2017 17:02:18 -0700 Subject: [PATCH] docs: Update code of conduct. --- docs/THIRDPARTY | 4 + docs/code-of-conduct.md | 166 +++++++++++++++++++++------------------- 2 files changed, 91 insertions(+), 79 deletions(-) diff --git a/docs/THIRDPARTY b/docs/THIRDPARTY index d48fb670d1..a34c0740ee 100644 --- a/docs/THIRDPARTY +++ b/docs/THIRDPARTY @@ -38,6 +38,10 @@ Files: confirmation/* Copyright: 2008, Jarek Zgoda License: BSD-3-Clause +Files: docs/code-of-conduct.md +Copyright: 2017, Kandra Labs Inc. +License: CC-BY-SA-4.0 + Files: puppet/apt/* Copyright: 2011, Evolving Web Inc. License: Expat diff --git a/docs/code-of-conduct.md b/docs/code-of-conduct.md index c474dd1309..3d401c5c0c 100644 --- a/docs/code-of-conduct.md +++ b/docs/code-of-conduct.md @@ -1,97 +1,105 @@ # Zulip Code of Conduct -## Our Commitment +Like the technical community as a whole, the Zulip team and community is +made up of a mixture of professionals and volunteers from all over the +world, working on every aspect of the mission, including mentorship, +teaching, and connecting people. -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers are committed to making participation in our -project and our community a harassment-free experience for everyone, regardless -of age, body size, disability, ethnicity, gender identity and expression, level -of experience, nationality, personal appearance, race, religion, or sexual -identity and orientation. +Diversity is one of our huge strengths, but it can also lead to +communication issues and unhappiness. To that end, we have a few ground +rules that we ask people to adhere to. This code applies equally to +founders, mentors, and those seeking help and guidance. -## Our Standards +This isn't an exhaustive list of things that you can't do. Rather, take it +in the spirit in which it's intended --- a guide to make it easier to enrich +all of us and the technical communities in which we participate. -Examples of behavior that contributes to creating a positive environment -include: +## Expected Behavior -* Using welcoming and inclusive language -* Being friendly and patient -* Being respectful of differing viewpoints and experiences, and trying to - understand other people's points of view -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members -* Assuming other community members have good intentions, and treating - them with respect and patience accordingly. -* Respecting the time and attention of others, in particular: - * Including tracebacks, any changes you've made, and other relevant - details in bug/error reports. - * Asking broadly relevant questions in public forums, rather than - sending private messages to individuals, so that the first available - expert can answer, and the answers are available to the whole - community. +The following behaviors are expected and requested of all community members: -Examples of unacceptable behavior by participants include: +* Participate. In doing so, you contribute to the health and longevity of + the community. +* Exercise consideration and respect in your speech and actions. +* Attempt collaboration before conflict. Assume good faith. +* Refrain from demeaning, discriminatory, or harassing behavior and speech. +* Take action or alert community leaders if you notice a dangerous + situation, someone in distress, or violations of this code, even if they + seem inconsequential. +* Community event venues may be shared with members of the public; be + respectful to all patrons of these locations. -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Criticism of contributions which is not constructive, which occurs outside - project channels or which is repetitive -* Publishing others' private information, such as a physical or electronic - address without explicit permission +## Unacceptable Behavior -We will exclude you from interaction if you insult, demean or harass anyone. -That is not welcome behavior. +The following behaviors are considered harassment and are unacceptable +within the Zulip community: -## Responsibilities of Project Maintainers +* Jokes or derogatory language that singles out members of any race, + ethnicity, culture, national origin, color, immigration status, social and + economic class, educational level, language proficiency, sex, sexual + orientation, gender identity and expression, age, size, family status, + political belief, religion, and mental and physical ability. +* Violence, threats of violence, or violent language directed against + another person. +* Disseminating or threatening to disseminate another person's personal + information. +* Personal insults of any sort. +* Posting or displaying sexually explicit or violent material. +* Inappropriate photography or recording. +* Deliberate intimidation, stalking, or following (online or in person). +* Unwelcome sexual attention. This includes sexualized comments or jokes, + inappropriate touching or groping, and unwelcomed sexual advances. +* Sustained disruption of community events, including talks and + presentations. +* Advocating for, or encouraging, any of the behaviors above. -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. +## Reporting and Enforcement -Project maintainers have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, or to ban temporarily or permanently any -contributor for other behaviors that they deem inappropriate, threatening, -offensive, or harmful. +Harassment and other code of conduct violations reduce the value of the +community for everyone. If someone makes you or anyone else feel unsafe or +unwelcome, please report it to the community organizers at +zulip-code-of-conduct@googlegroups.com as soon as possible. You can make a +report either personally or anonymously. + +If a community member engages in unacceptable behavior, the community +organizers may take any action they deem appropriate, up to and including a +temporary ban or permanent expulsion from the community without warning (and +without refund in the case of a paid event). + +If someone outside the development community (e.g. a user of the Zulip +software) engages in unacceptable behavior that affects someone in the +community, we still want to know. Even if we don't have direct control over +the violator, the community organizers can still support the people +affected, reduce the chance of a similar violation in the future, and take +any direct action we can. + +The nature of reporting means it can only help after the fact. If you see +something you can do while a violation is happening, do it. A lot of the +harms of harassment and other violations can be mitigated by the victim +knowing that the other people present are on their side. + +All reports will be kept confidential. In some cases we may determine that a +public statement will need to be made. In such cases, the identities of all +victims and reporters will remain confidential unless those individuals +instruct us otherwise. ## Scope -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -project spaces include mailing lists, chat.zulip.org, GitHub and in code. -Examples of representing a project or community include using an official -project e-mail address, posting via an official social media account, or acting -as an appointed representative at an online or offline event. +We expect all community participants (contributors, paid or otherwise, +sponsors, and other guests) to abide by this Code of Conduct in all +community venues, online and in-person, as well as in all private +communications pertaining to community business. -## Enforcement +This Code of Conduct and its related procedures also applies to unacceptable +behavior occurring outside the scope of community activities when such +behavior has the potential to adversely affect the safety and well-being of +community members. -To report code of conduct violations or concerns, please contact -zulip-code-of-conduct@googlegroups.com immediately. Whether you're a -regular contributor or a newcomer, we care about making this community -a safer place for you and we've got your back. +## License and Attribution -We encourage anyone who observes abusive, harassing, or otherwise -unacceptable behavior to report that by emailing -zulip-code-of-conduct@googlegroups.com. All reports will be reviewed -and investigated and will result in a response that is deemed -necessary and appropriate to the circumstances by the project -maintainers. The project team will keep confidential the details of -the reporter when possible. - -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][cchomepage] -[version 1.4][ccversion] and the [Rust Code of Conduct][rsconduct]. - -[cchomepage]: http://contributor-covenant.org -[ccversion]: http://contributor-covenant.org/version/1/4/ -[rsconduct]: https://www.rust-lang.org/en-US/conduct.html +This Code of Conduct is adapted from the +[Citizen Code of Conduct](http://citizencodeofconduct.org/) and the +[Django Code of Conduct](https://www.djangoproject.com/conduct/), and is +under a +[Creative Commons BY-SA](http://creativecommons.org/licenses/by-sa/4.0/) +license.