From owner-svn-doc-head@freebsd.org Mon Feb 12 20:43:11 2018 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A48B0F1B0CE; Mon, 12 Feb 2018 20:43:11 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 553DB6C9FC; Mon, 12 Feb 2018 20:43:11 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F4441700E; Mon, 12 Feb 2018 20:43:11 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1CKhB8r069371; Mon, 12 Feb 2018 20:43:11 GMT (envelope-from bcr@FreeBSD.org) Received: (from bcr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1CKhBuv069370; Mon, 12 Feb 2018 20:43:11 GMT (envelope-from bcr@FreeBSD.org) Message-Id: <201802122043.w1CKhBuv069370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bcr set sender to bcr@FreeBSD.org using -f From: Benedict Reuschling Date: Mon, 12 Feb 2018 20:43:11 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51417 - head/en_US.ISO8859-1/htdocs/internal X-SVN-Group: doc-head X-SVN-Commit-Author: bcr X-SVN-Commit-Paths: head/en_US.ISO8859-1/htdocs/internal X-SVN-Commit-Revision: 51417 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Feb 2018 20:43:12 -0000 Author: bcr Date: Mon Feb 12 20:43:11 2018 New Revision: 51417 URL: https://svnweb.freebsd.org/changeset/doc/51417 Log: Announce the new Code of Conduct for the Project. A lot of work by many people went into making this new code better than the one we had, including: Valerie Aurora, Anne Dickison, Warner Losh, Colin Percival, Benno Rice, Devin Teske, and Robert Watson. Approved by: core@ Modified: head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml Modified: head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml Mon Feb 12 17:51:01 2018 (r51416) +++ head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml Mon Feb 12 20:43:11 2018 (r51417) @@ -8,142 +8,260 @@ &title; - $FreeBSD$ - + $FreeBSD$ + -

Introduction

+

&os; Code of Conduct

-

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.

-

Interpersonal Interaction

+

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:

+
    -
  • Keep it civil.
  • -
  • Be tolerant.
  • -
  • Remember that you are in public and that your actions - determine the public perception of the project.
  • -
  • Do not make it personal. Do not take it personally.
  • -
+
  • Comments that reinforce systemic oppression related to + gender, gender identity and expression, sexual orientation, + disability, mental illness, neurodiversity, physical + appearance, body size, age, race, or religion.
  • -

    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.

    +
  • Unwelcome comments regarding a person's lifestyle choices + and practices, including those related to food, health, + parenting, drugs, and employment.
  • -

    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.

    +
  • Deliberate misgendering.
  • -

    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.

    +
  • Deliberate use of "dead" or rejected names.
  • -

    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.

    +
  • Gratuitous or off-topic sexual images or behaviour in spaces + where they're not appropriate.
  • -

    What Will Not Be Tolerated

    +
  • Physical contact and simulated physical contact (e.g., + textual descriptions like "*hug*" or + "*backrub*") without consent or after a request + to stop.
  • -

    The following will not be tolerated, and can result in - expulsion from the community

    +
  • Threats of violence.
  • +
  • Incitement of violence towards any individual, including + encouraging a person to commit suicide or to engage in + self-harm.
  • + +
  • Deliberate intimidation.
  • + +
  • Stalking or following.
  • + +
  • Harassing photography or recording, including logging online + activity for harassment purposes.
  • + +
  • Sustained disruption of discussion.
  • + +
  • Unwelcome sexual attention.
  • + +
  • Pattern of inappropriate social contact, such as + requesting/assuming inappropriate levels of intimacy with + others.
  • + +
  • Continued one-on-one communication after requests to + cease.
  • + +
  • Deliberate "outing" of any private aspect of a + person's identity without their consent except as necessary to + protect vulnerable people from intentional abuse.
  • + +
  • Publication of non-harassing private communication without + consent.
  • + +
  • Publication of non-harassing private communication with + consent but in a way that intentionally misrepresents the + communication (e.g., removes context that changes the + meaning).
  • + +
  • Knowingly making harmful false claims about a person.
  • + + +

    Reporting Instructions

    + +

    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:

    +
      -
    • Discrimination based on gender, race, nationality, - sexuality, religion, age or physical disability.
    • -
    • Bullying or systematic harassment.
    • -
    • Incitement to or condoning of any of these.
    • +
    • Your name and contact info (so we can get in touch with you + if we need to follow up)
    • + +
    • Names (real, nicknames, and/or pseudonyms) of any + individuals involved. If there were other witnesses besides + you, please try to include them as well.
    • + +
    • When and where the incident occurred. Please be as specific + as possible.
    • + +
    • Your account of what occurred. If there is a publicly + available record (e.g. a mailing list archive, tweet, or a + public IRC logger) please include a link and/or screen + shots.
    • + +
    • Any extra context you believe relevant for the + incident.
    • + +
    • If you believe this incident is ongoing.
    • + +
    • Any other information you believe we should have.
    -

    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.

    +

    What happens after you file a report?

    -

    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.

    +
      +
    • Whether an investigation is needed, including interviewing + additional parties or witnesses;
    • -

      In Case of Conflict

      +
    • What appears to have happened and;
    • +
    • Whether the behavior constitutes a Code of Conduct + violation.
    • +
    + +

    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 contested, back out your changes first, then argue your - case.
    • -
    • Ask for review.
    • -
    • Seek approval from maintainers.
    • -
    • When no mutually satisfactory resolution can be achieved, - defer to security-officer, doceng, portmgr, or core
    • +
    • Nothing (for example, if we determine that no violation + occurred).
    • + +
    • If determined to be solely technical in nature or if it + falls outside the scope of the Code of Conduct, forwarding the + incident to the &os; Core Team
    • + +
    • A private reprimand from the working group to the + individual(s) involved.
    • + +
    • A public reprimand.
    • + +
    • An imposed vacation from &os; Project controlled spaces + (e.g. asking someone to "take a week off" from a + mailing list or IRC).
    • + +
    • A permanent or temporary ban from some or all &os; + Project controlled spaces (events, meetings, mailing lists, + IRC, etc.)
    • + +
    • A request for a public or private apology.
    • + +
    • A request to engage in mediation and/or an accountability + plan.
    -

    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.

    +

    Appeals

    + +

    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.

    + +

    Glossary

    + +
    +
    Systemic oppression:
    + +
    +

    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)

    + +
    Dead names:
    + +
    +

    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.

    + +

    Attribution

    + +

    This Code of Conduct is based on the example policy from the Geek + Feminism wiki.