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 @@
<body class="navinclude.docs">
- <h2>&os; Code of Conduct</h2>
+ <h2>&os; Community Code of Conduct</h2>
- <p>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.</p>
+ <p>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:</p>
- <p>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.</p>
-
- <p>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.</p>
-
- <p>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.</p>
-
- <p>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:</p>
-
<ul>
- <li>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.</li>
+ <li>be friendly and patient,</li>
- <li>Unwelcome comments regarding a person's lifestyle choices
- and practices, including those related to food, health,
- parenting, drugs, and employment.</li>
+ <li>be welcoming,</li>
- <li>Deliberate misgendering.</li>
+ <li>be considerate,</li>
- <li>Deliberate use of "dead" or rejected names.</li>
+ <li>be respectful,</li>
- <li>Gratuitous or off-topic sexual images or behaviour in spaces
- where they're not appropriate.</li>
+ <li>be careful in the words that you choose and be kind to
+ others,</li>
- <li>Physical contact and simulated physical contact (e.g.,
- textual descriptions like "*hug*" or
- "*backrub*") without consent or after a request
- to stop.</li>
+ <li>when we disagree, try to understand why.</li>
+ </ul>
- <li>Threats of violence.</li>
+ <p>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.</p>
- <li>Incitement of violence towards any individual, including
- encouraging a person to commit suicide or to engage in
- self-harm.</li>
+ <p>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.</p>
- <li>Deliberate intimidation.</li>
+ <p>If you believe someone is violating the code of conduct, we ask
+ that you report it by emailing <a
+ href="mailto:conduct@freebsd.org">conduct@freebsd.org</a>. For
+ more details please see our <a
+ href="https://www.freebsd.org/internal/conduct-reporting.html">Reporting
+ Guide</a>.</p>
- <li>Stalking or following.</li>
+ <ul>
+ <li><b>Be friendly and patient.</b></li>
- <li>Harassing photography or recording, including logging online
- activity for harassment purposes.</li>
+ <li><b>Be welcoming.</b> 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.</li>
- <li>Sustained disruption of discussion.</li>
+ <li><b>Be considerate.</b> 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.</li>
- <li>Unwelcome sexual attention.</li>
+ <li><b>Be respectful.</b> 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.</li>
- <li>Pattern of inappropriate social contact, such as
- requesting/assuming inappropriate levels of intimacy with
- others.</li>
+ <li><b>Be careful in the words that you choose and be kind to
+ others.</b> Do not insult or put down other participants.
+ Harassment and other exclusionary behavior aren't acceptable.
+ This includes, but is not limited to:
- <li>Continued one-on-one communication after requests to
- cease.</li>
+ <ul>
+ <li>Violent threats or language directed against another
+ person.</li>
- <li>Deliberate "outing" of any private aspect of a
- person's identity without their consent except as necessary to
- protect vulnerable people from intentional abuse.</li>
+ <li>Discriminatory jokes and language.</li>
- <li>Publication of non-harassing private communication without
- consent.</li>
+ <li>Posting sexually explicit or violent material.</li>
- <li>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).</li>
+ <li>Posting (or threatening to post) other people's
+ personally identifying information ("doxing").</li>
- <li>Knowingly making harmful false claims about a person.</li>
- </ul>
+ <li>Personal insults, especially those using racist or
+ sexist terms.</li>
- <h2>Reporting</h2>
- <p>The reporting process is documented at <a
- href="conduct-reporting.html">Code of Conduct Reporting
- Instructions</a>.</p>
+ <li>Unwelcome sexual attention.</li>
- <h2>Glossary</h2>
+ <li>Advocating for, or encouraging, any of the above
+ behavior.</li></ul></li>
- <dl>
- <dt>Systemic oppression:</dt>
+ <li>In general, if someone asks you to stop, then stop.
+ Persisting in such behavior after being asked to stop is
+ considered harassment.</li>
- <dd>
- <p>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)</p></dd>
+ <li><b>When we disagree, try to understand why.</b>
+ 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.</li></ul>
- <dt>Dead names:</dt>
+ <h2>Questions?</h2>
- <dd>
- <p>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.</p></dd></dl>
+ <p>If you have questions, please feel free to contact the &os;
+ Code of Conduct Committee by emailing <a
+ href="mailto:conduct@freebsd.org">conduct@freebsd.org</a> or
+ the &os; Core team <a
+ href="mailto:core@freebsd.org">core@freebsd.org</a>.</p>
- <h2>Attribution</h2>
-
- <p>This Code of Conduct is based on the example policy from the <a
- href="http://geekfeminism.wikia.com/wiki/Community_anti-harassment">Geek
- Feminism wiki</a>.</p>
+ <p>(This text is based on the LLVM Project's <a
+ href="https://llvm.org/docs/CodeOfConduct.html">draft
+ CoC</a>, which in turn is based on the <a
+ href="https://www.djangoproject.com/conduct/">Django
+ Project</a> Code of Conduct, which is in turn based on
+ wording from the <a href="http://speakup.io/coc.html">Speak
+ Up! project</a>.)</p>
</body>
</html>