diff --git a/website/content/en/internal/code-of-conduct.adoc b/website/content/en/internal/code-of-conduct.adoc index 70912ef760..601b344ed7 100644 --- a/website/content/en/internal/code-of-conduct.adoc +++ b/website/content/en/internal/code-of-conduct.adoc @@ -1,46 +1,52 @@ --- title: "FreeBSD Community Code of Conduct" sidenav: docs --- = FreeBSD Community Code of Conduct == FreeBSD Community Code of Conduct -The FreeBSD 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: +The FreeBSD 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: * be friendly and patient, * be welcoming, * be considerate, * be respectful, * be careful in the words that you choose and be kind to others, * when we disagree, try to understand why. -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 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 FreeBSD project. This includes online chat, mailing lists, bug trackers, FreeBSD 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. +This code of conduct applies to all spaces managed by the FreeBSD project. +This includes online chat, mailing lists, bug trackers, FreeBSD 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 mailto:conduct@freebsd.org[conduct@FreeBSD.org]. For more details please see our link:../conduct-reporting/[Reporting Guide]. +If you believe someone is violating the code of conduct, we ask that you report it by emailing mailto:conduct@freebsd.org[conduct@FreeBSD.org]. +For more details please see our link:../conduct-reporting/[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 FreeBSD community should be respectful when dealing with other members as well as with people outside the FreeBSD 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 FreeBSD is no exception. It is important that we resolve disagreements and differing views constructively. Remember that we're different. The strength of FreeBSD 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 FreeBSD Code of Conduct Committee by emailing mailto:conduct@freebsd.org[conduct@FreeBSD.org] or the FreeBSD Core team mailto:core@freebsd.org[core@FreeBSD.org]. (This text is based on the LLVM Project's https://llvm.org/docs/CodeOfConduct.html[draft CoC], which in turn is based on the https://www.djangoproject.com/conduct/[Django Project] Code of Conduct, which is in turn based on wording from the Speak Up! project.) Publication date: 2020-06-09 diff --git a/website/content/en/internal/conduct-reporting.adoc b/website/content/en/internal/conduct-reporting.adoc index 0574a39de3..88bbfce5cb 100644 --- a/website/content/en/internal/conduct-reporting.adoc +++ b/website/content/en/internal/conduct-reporting.adoc @@ -1,57 +1,66 @@ --- title: "FreeBSD Code of Conduct Reporting Instructions" sidenav: docs --- = FreeBSD Code of Conduct Reporting Instructions == FreeBSD Code of Conduct Reporting Instructions If you believe someone is violating the link:../code-of-conduct[code of conduct] we ask that you report it to the FreeBSD 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. +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: * 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. == What happens after you file a report? You will receive an email from the FreeBSD Code of Conduct Committee acknowledging receipt of your report within 48 hours. The committee will meet as quickly as possible to review the incident and determine: * Whether an investigation is needed, including interviewing additional parties or witnesses; * What appears to have happened and; * Whether the behavior constitutes a Code of Conduct violation. If a member of the FreeBSD 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: +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: * 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 FreeBSD Core Team * A private reprimand from the working group to the individual(s) involved. * A public reprimand. * An imposed vacation from FreeBSD 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 FreeBSD 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. 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. -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. +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. -Finally, the committee will make a report on the situation to the FreeBSD Core Team. The Core Team may choose to issue a public report of the incident. +Finally, the committee will make a report on the situation to the FreeBSD Core Team. +The Core Team may choose to issue a public report of the incident. == Appeals -Only permanent resolutions (such as bans) may be appealed. To appeal a decision of the CoC Committee, contact the FreeBSD Core Team at core@freebsd.org with your appeal and the Core Team will review the case. +Only permanent resolutions (such as bans) may be appealed. +To appeal a decision of the CoC Committee, contact the FreeBSD Core Team at core@freebsd.org with your appeal and the Core Team will review the case.