diff --git a/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml b/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml
index 4df6374fe3..aea5603c61 100644
--- a/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml
+++ b/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml
@@ -1,150 +1,148 @@
]>
&title;
$FreeBSD$
- &os; 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.
-
- 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:
+ &os; Community Code of Conduct
-
- - 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.
-
- - Unwelcome comments regarding a person's lifestyle choices
- and practices, including those related to food, health,
- parenting, drugs, and employment.
-
- - Deliberate misgendering.
-
- - Deliberate use of "dead" or rejected names.
-
- - Gratuitous or off-topic sexual images or behaviour in spaces
- where they're not appropriate.
-
- - Physical contact and simulated physical contact (e.g.,
- textual descriptions like "*hug*" or
- "*backrub*") without consent or after a request
- to stop.
-
- - Threats of violence.
-
- - Incitement of violence towards any individual, including
- encouraging a person to commit suicide or to engage in
- self-harm.
+ 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:
- - 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.
+
+ - be friendly and patient,
- - Continued one-on-one communication after requests to
- cease.
+ - be welcoming,
- - Deliberate "outing" of any private aspect of a
- person's identity without their consent except as necessary to
- protect vulnerable people from intentional abuse.
+ - be considerate,
- - Publication of non-harassing private communication without
- consent.
+ - be respectful,
- - 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).
+ - be careful in the words that you choose and be kind to
+ others,
- - Knowingly making harmful false claims about a person.
+ - when we disagree, try to understand why.
- Reporting
- The reporting process is documented at Code of Conduct Reporting
- Instructions.
-
- 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.
+ 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.
+
+ 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.
+
+ 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.
+
+
+ - Be friendly and patient.
+
+ - 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.
+
+ - 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.
+
+ - 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.
+
+ - 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:
+
+
+ - Violent threats or language directed against another
+ person.
+
+ - Discriminatory jokes and language.
+
+ - Posting sexually explicit or violent material.
+
+ - Posting (or threatening to post) other people's
+ personally identifying information ("doxing").
+
+ - Personal insults, especially those using racist or
+ sexist terms.
+
+ - Unwelcome sexual attention.
+
+ - Advocating for, or encouraging, any of the above
+ behavior.
+
+ - In general, if someone asks you to stop, then
+ stop. Persisting in such behavior after being asked to
+ stop is considered harassment.
+
+ - 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.
+
+ Questions?
+
+ 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.
+
+ (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.)