From owner-svn-doc-head@freebsd.org Tue Jun 9 20:04:48 2020 Return-Path: Delivered-To: svn-doc-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 72C1033B1C0; Tue, 9 Jun 2020 20:04:48 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hLgh2RHfz4YCB; Tue, 9 Jun 2020 20:04:48 +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 4EED41B509; Tue, 9 Jun 2020 20:04:48 +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 059K4mCR032779; Tue, 9 Jun 2020 20:04:48 GMT (envelope-from bcr@FreeBSD.org) Received: (from bcr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 059K4mxg032778; Tue, 9 Jun 2020 20:04:48 GMT (envelope-from bcr@FreeBSD.org) Message-Id: <202006092004.059K4mxg032778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bcr set sender to bcr@FreeBSD.org using -f From: Benedict Reuschling Date: Tue, 9 Jun 2020 20:04:48 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r54229 - 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: 54229 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.33 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: Tue, 09 Jun 2020 20:04:48 -0000 Author: bcr Date: Tue Jun 9 20:04:47 2020 New Revision: 54229 URL: https://svnweb.freebsd.org/changeset/doc/54229 Log: Per FreeBSD developer consensus (overwhelming majority), adopt an LLVM-derived Code of Conduct. The new policy will be visible at https://www.freebsd.org/internal/code-of-conduct.html Approved by: core Differential Revision: https://reviews.freebsd.org/D25200 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 Tue Jun 9 19:10:01 2020 (r54228) +++ head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml Tue Jun 9 20:04:47 2020 (r54229) @@ -14,137 +14,135 @@ -

&os; Code of Conduct

+

&os; Community Code of Conduct

-

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.

+

The &os; community has always worked to be a welcoming and + respectful community, and we want to ensure that doesn't change + as we grow and evolve. To that end, we have a few ground rules + that we ask people to adhere to:

-

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:

-
    -
  • 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.
  • +
  • be friendly and patient,
  • -
  • Unwelcome comments regarding a person's lifestyle choices - and practices, including those related to food, health, - parenting, drugs, and employment.
  • +
  • be welcoming,
  • -
  • Deliberate misgendering.
  • +
  • be considerate,
  • -
  • Deliberate use of "dead" or rejected names.
  • +
  • be respectful,
  • -
  • Gratuitous or off-topic sexual images or behaviour in spaces - where they're not appropriate.
  • +
  • be careful in the words that you choose and be kind to + others,
  • -
  • Physical contact and simulated physical contact (e.g., - textual descriptions like "*hug*" or - "*backrub*") without consent or after a request - to stop.
  • +
  • when we disagree, try to understand why.
  • +
-
  • Threats of violence.
  • +

    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 communicate and participate in the + community.

    -
  • Incitement of violence towards any individual, including - encouraging a person to commit suicide or to engage in - self-harm.
  • +

    This code of conduct applies to all spaces managed by the &os; + project. This includes online chat, mailing lists, bug trackers, + &os; events such as the developer meetings and socials, and any + other forums created by the project that the community uses for + communication. It applies to all of your communication and + conduct in these spaces, including emails, chats, things you + say, slides, videos, posters, signs, or even t-shirts you + display in these spaces. In addition, violations of this code + outside these spaces may, in rare cases, affect a person's + ability to participate within them, when the conduct amounts to + an egregious violation of this code.

    -
  • Deliberate intimidation.
  • +

    If you believe someone is violating the code of conduct, we ask + that you report it by emailing conduct@FreeBSD.org. For + more details please see our Reporting Guide.

    -
  • Stalking or following.
  • +
      +
    • Be friendly and patient.
    • -
    • Harassing photography or recording, including logging online - activity for harassment purposes.
    • +
    • Be welcoming. We strive to be a community that + welcomes and supports people of all backgrounds and + identities. This includes, but is not limited to members of + any race, ethnicity, culture, national origin, color, + immigration status, social and economic class, educational + level, sex, sexual orientation, gender identity and + expression, age, size, family status, political belief, + religion or lack thereof, and mental and physical + ability.
    • -
    • Sustained disruption of discussion.
    • +
    • Be considerate. Your work will be used by other + people, and you in turn will depend on the work of others. Any + decision you take will affect users and colleagues, and you + should take those consequences into account. Remember that + we're a world-wide community, so you might not be + communicating in someone else's primary language.
    • -
    • Unwelcome sexual attention.
    • +
    • Be respectful. Not all of us will agree all the time, + but disagreement is no excuse for poor behavior and poor + manners. We might all experience some frustration now and + then, but we cannot allow that frustration to turn into a + personal attack. It's important to remember that a community + where people feel uncomfortable or threatened is not a + productive one. Members of the &os; community should be + respectful when dealing with other members as well as with + people outside the &os; community.
    • -
    • Pattern of inappropriate social contact, such as - requesting/assuming inappropriate levels of intimacy with - others.
    • +
    • Be careful in the words that you choose and be kind to + others. Do not insult or put down other participants. + Harassment and other exclusionary behavior aren't acceptable. + This includes, but is not limited to: -
    • Continued one-on-one communication after requests to - cease.
    • +
        +
      • Violent threats or language directed against another + person.
      • -
      • Deliberate "outing" of any private aspect of a - person's identity without their consent except as necessary to - protect vulnerable people from intentional abuse.
      • +
      • Discriminatory jokes and language.
      • -
      • Publication of non-harassing private communication without - consent.
      • +
      • Posting sexually explicit or violent material.
      • -
      • 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).
      • +
      • Posting (or threatening to post) other people's + personally identifying information ("doxing").
      • -
      • Knowingly making harmful false claims about a person.
      • -
      +
    • Personal insults, especially those using racist or + sexist terms.
    • -

      Reporting

      -

      The reporting process is documented at Code of Conduct Reporting - Instructions.

      +
    • Unwelcome sexual attention.
    • -

      Glossary

      +
    • Advocating for, or encouraging, any of the above + behavior.
    -
    -
    Systemic oppression:
    +
  • In general, if someone asks you to stop, then + stop. Persisting in such behavior after being asked to + stop is considered harassment.
  • -
    -

    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)

    +
  • When we disagree, try to understand why. + Disagreements, both social and technical, happen all the + time and &os; is no exception. It is important that we + resolve disagreements and differing views constructively. + Remember that we're different. The strength of &os; comes + from its varied community, people from a wide range of + backgrounds. Different people have different perspectives on + issues. Being unable to understand why someone holds a + viewpoint doesn't mean that they're wrong. Don't forget that + it is human to err and blaming each other doesn't get us + anywhere. Instead, focus on helping to resolve issues and + learning from mistakes.
  • -
    Dead names:
    +

    Questions?

    -
    -

    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.

    +

    If you have questions, please feel free to contact the &os; + Code of Conduct Committee by emailing conduct@FreeBSD.org or + the &os; Core team core@FreeBSD.org.

    -

    Attribution

    - -

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

    +

    (This text is based on the LLVM Project's draft + CoC, which in turn is based on the Django + Project Code of Conduct, which is in turn based on + wording from the Speak Up! project.)