Index: en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml =================================================================== --- en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml +++ en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml @@ -14,137 +14,137 @@ -

&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:

- -
  • 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.
    • + -
    -
    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.)