Index: head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml =================================================================== --- head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml (revision 51416) +++ head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml (revision 51417) @@ -1,149 +1,267 @@ ]>
We expect everyone involved with the &os; project to follow - this Code of Conduct. This not only includes developers and - contributors to &os; but also anyone posting to &os; mailing - lists or using the &os; Forums or chatting on &os; specific IRC - channels, or otherwise interacting with the &os; community.
+The &os; Project is inclusive. We want the &os; Project + to be a venue where people of all backgrounds can work together + to make the best operating system, built by a strong community. + These values extend beyond just development to all aspects of + the Project. All those given recognition as members of the + Project in whatever form are seen as ambassadors of the + Project.
-Each individual's behavior is primarily a matter for their - personal conscience. Even so, there are limits whose breach - will not be tolerated. This page explains what is normally - expected of &os; community members, and what is absolutely - required.
+Diversity is a huge strength and is critical to the long term + success of the Project. To that end we have a few ground rules + that we ask people to adhere to. This code applies equally to + everyone representing the &os; Project in any way, from new + members, to committers, to the core team itself. These rules + are intended to ensure a safe, harassment-free environment for + all and to ensure that everyone feels welcome both working + within, and interacting with, the Project.
-This document is not an exhaustive list of things that you + should not do. Rather, consider it a guide to make it easier to + enrich all of us and the technical communities in which we + participate.
+This code of conduct applies to all spaces used by the &os; + Project, including our mailing lists, IRC channels, and social + media, both online and off. Anyone who is found to violate this + code of conduct may be sanctioned or expelled from &os; + Project controlled spaces at the discretion of the &os; Code + of Conduct Committee.
+ +Some &os; Project spaces may have additional rules in place, + which will be made clearly available to participants. + Participants are responsible for knowing and abiding by these + rules. Harassment includes but is not limited to:
+Always strive to present a civil and courteous demeanour in - your dealings with other project members; moreso when dealing - with third parties from outside the project. Avoid foul or - abusive language: remember that cultural standards differ, and - that what may seem to you to be a very mild statement can be - deeply shocking to another. Avoid contentious topics (unless - directly technically relevant). These things all have their - places, but not here, where they are out of context.
+Try not to take offense where no offense was intended. Not - everyone speaks or writes English fluently. Not everyone can - express themselves clearly. Give people the benefit of the - doubt. Even if the intent was to provoke, do not rise to - it.
+Conflict is inevitable, but unseemly conduct is not. If you - must disagree forcefully, do so within the appropriate technical - discussion group and in a manner that will be acceptable to your - audience. Stay focused on the topic at hand. Heated - arguments have a way of dragging in bystanders and mutating - until the original point is lost.
+Stick to the facts. Anyone may disagree with you: this does - not give you a license to descend into personal insults. If - your arguments cannot stand up in their own right, then either - admit defeat gracefully or formulate better arguments.
+The following will not be tolerated, and can result in - expulsion from the community
+If you believe someone is violating the code of conduct we ask + that you report it to the &os; Code of Conduct Committee by + emailing conduct@freebsd.org.
+ +All reports will be kept confidential whenever possible. We + strive to protect the identity and safety of reporters. In some + cases we may need to make a public statement of some form, in + which case we will use the minimum of details and identifying + information necessary to protect our community. In rare cases, + we may need to identify some of the people involved to comply + with the law or protect other potential victims. In these + cases, we will consult with the reporter to find out what their + wishes are and take them into account in our final decision. In + all cases, we will not directly or indirectly identify reporters + without their consent unless we see no other option.
+ +If you believe anyone is in physical danger, please notify + appropriate law enforcement first. In your report please + include:
+There can be no place - within the &os; Community for discriminatory speech or action. - We do not believe anyone should be treated any differently based - on who they are, where they are from, where their ancestors were - from, what they look like, what gender they identify as, who - they choose to sleep with, how old they are, their physical - capabilities or what sort of religious beliefs they may hold. - What matters is the contribution they are able to make to the - project, and only that.
+There is no place within the &os; Community for - behavior intended to intimidate or persecute other members of - the community. No one should have any cause to fear involvement - with the &os; project.
+You will receive an email from the &os; Code of Conduct + Committee acknowledging receipt of your report within 48 + hours.
-We will not tolerate any member of the community, either - publicly or privately, giving aid or encouragement to any - third party to behave in such a way towards any members of - the &os; community.
+The committee will meet as quickly as possible to review the + incident and determine:
-Core will remove any and all access to &os; resources or - privileges for whatever period it deems fit, up to and including - a permanent ban where it rules that a transgression has - happened.
+If a member of the &os; Code of Conduct Committee is one of + the individuals included in the report they will recuse + themselves from handling the report.
+ +Once the working group has a complete account of the events + they will make a decision as to how to respond. Actions taken + may include:
+If there are a sustained set of objections to a change you - have made, be graceful and revert what you have done. - Objections are hardly likely to be raised for trivial reasons, - and commits can always be re-applied. The potential loss of - reputation for the project from shipping bad code is - permanent.
+We will do our best to respond within one week to the person + who filed the report with either a resolution or an explanation + of why the situation is not yet resolved.
-Seeking review beforehand is the best way to avoid - misunderstanding. It is not just good practice for improving - code quality: it facilitates putting opposing technical - arguments clearly and reasonably.
+Once we have determined our final action, we will contact the + original reporter to let them know what action (if any) we will + be taking. We will take into account feedback from the reporter + on the appropriateness of our response, but we do not guarantee + we will act on it.
-It is strongly encouraged that you consult maintainers before - making changes in their particular areas, although in many areas - some teams have given blanket approval for certain types of - change. For instance, various types of sweeping updates to the - ports are permitted without reference to individual port - maintainers. It is the duty of committers and maintainers to - keep up-to-date with such standards and practices, and abide by - them. Getting maintainer approval for any change, even if not - strictly required, is never a bad thing, and certainly - courteous.
+Finally, the committee will make a report on the situation to + the &os; Core Team. The Core Team may choose to issue a + public report of the incident.
-If you cannot agree, who should you turn to for arbitration? - Core itself is directly responsible for the base system, but has - delegated control over ports, documentation, release engineering - and security related functions to sub-committees. Operational - control of &os; cluster servers, user accounts, e-mail, various - web-based and other services have been similarly devolved to specific teams. These teams - are the first line of resort when disputes cannot be resolved and - require mediation. Failing that, a decision by core will be - final.
+Only permanent resolutions (such as bans) may be appealed. To + appeal a decision of the CoC Committee, contact the &os; Core + Team at core@freebsd.org + with your appeal and the Core Team will review the case.
+ +The ways in which history, culture, ideology, public + policies, institutional practices, and personal behaviors + and beliefs interact to maintain a hierarchy — based + on race, class, gender, sexuality, and/or other group + identities — that allows the privileges associated + with the dominant group and the disadvantages associated + with the oppressed, targeted, or marginalized group to + endure and adapt over time. (Derived from Aspen Institute, + via Open Source Leadership)
A name assigned to a person at birth which they no longer + identify with. Most often used to refer to the assigned + name of a trans person who has publicly identified + themselves under a new name. Deliberately using a dead name + is an act of hostility.
This Code of Conduct is based on the example policy from the Geek + Feminism wiki.