From 6df3940c2604341f6378e324884e6714a78e04dc Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Wed, 20 Jun 2018 23:46:04 +0200 Subject: [PATCH] conduct: Upgrade to Contributor Covenant It's pretty much the GitHub standard, says the obvious, and does it better than our old one which was a little bit rambling. Intentionally just doing it instead of discussing it, in the hope of avoiding trolling. So sue me. --- CONDUCT.md | 129 +++++++++++++++++++++++------------------------------ 1 file changed, 55 insertions(+), 74 deletions(-) diff --git a/CONDUCT.md b/CONDUCT.md index 66f72b48f..de11e281f 100644 --- a/CONDUCT.md +++ b/CONDUCT.md @@ -1,92 +1,73 @@ -## Conduct +# Contributor Covenant Code of Conduct -* 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. +## Our Pledge -* On IRC, please avoid using overtly sexual nicknames or other nicknames - that might detract from a friendly, safe and welcoming environment for - all. +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge 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, +education, socio-economic status, nationality, personal appearance, race, +religion, or sexual identity and orientation. -* Please be kind and courteous. There's no need to be mean or rude. +## Our Standards -* 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. +Examples of behavior that contributes to creating a positive environment +include: -* 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. +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members -* We will exclude you from interaction if you insult, demean or harass - anyone. That is not welcome behaviour. We interpret the term - "harassment" as including the definition in the Citizen Code of Conduct; - 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. +Examples of unacceptable behavior by participants include: -* 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 - Syncthing core team immediately. 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. +* 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 +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting -* Likewise any spamming, trolling, flaming, baiting or other - attention-stealing behaviour is not welcome. +## Our Responsibilities -## Moderation +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. -These are the policies for upholding our community's standards of -conduct in our communication channels, most notably in Syncthing-related -IRC channels and on the web forum. +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. -1. Remarks that violate the Syncthing standards of conduct, including - hateful, hurtful, oppressive, or exclusionary remarks, are not - allowed. (Cursing is allowed, but never targeting another user, and - never in a hateful manner.) +## Scope -2. Remarks that moderators find inappropriate, whether listed in the - code of conduct or not, are also not allowed. +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 +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. Representation of a project may be +further defined and clarified by project maintainers. -3. Moderators will first respond to such remarks with a warning. +## Enforcement -4. If the warning is unheeded, the user will be "kicked," i.e., kicked - out of the communication channel to cool off. +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at security@syncthing.net. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. -5. If the user comes back and continues to make trouble, they will be - banned, i.e., indefinitely excluded. +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. -6. Moderators may choose at their discretion to un-ban the user if it - was a first offense and they offer the offended party a genuine - apology. +## Attribution -7. If a moderator bans someone and you think it was unjustified, please - take it up with that moderator, or with a different moderator, **in - private**. Complaints about bans in-channel are not allowed. +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html -8. Moderators are held to a higher standard than other community - members. If a moderator creates an inappropriate situation, they - should expect less leeway than others. - -In the Syncthing community we strive to go the extra step to look out -for each other. Don't just aim to be technically unimpeachable, try to -be your best self. In particular, avoid flirting with offensive or -sensitive issues, particularly if they're off-topic; this all too -often leads to unnecessary fights, hurt feelings, and damaged trust; -worse, it can drive people away from the community entirely. - -And if someone takes issue with something you said or did, resist the -urge to be defensive. Just stop doing what it was they complained about -and apologize. Even if you feel you were misinterpreted or unfairly -accused, chances are good there was something you could've communicated -better — remember that it's your responsibility to make your fellow -community members comfortable. Everyone wants to get along and we are -all here first and foremost because we want to talk about cool -technology. You will find that people will be eager to assume good -intent and forgive as long as you earn their trust. - -*Adapted from the [Rust Code of Conduct](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct)* - -*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)* +[homepage]: https://www.contributor-covenant.org