Index: head/en_US.ISO8859-1/htdocs/internal/Makefile =================================================================== --- head/en_US.ISO8859-1/htdocs/internal/Makefile (revision 53685) +++ head/en_US.ISO8859-1/htdocs/internal/Makefile (revision 53686) @@ -1,37 +1,38 @@ # $FreeBSD$ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif DOCS= about.xml DOCS+= bylaws.xml DOCS+= clusteradm.xml DOCS+= code-of-conduct.xml +DOCS+= conduct-reporting.xml DOCS+= core-vote.xml DOCS+= data.xml DOCS+= developer.xml DOCS+= doceng.xml DOCS+= expire-bits.xml DOCS+= hats.xml DOCS+= i18n.xml DOCS+= internal.xml DOCS+= machines.xml DOCS+= members.xml DOCS+= mirror.xml DOCS+= new-account.xml DOCS+= policies.xml DOCS+= proposing-committers.xml DOCS+= releng.xml DOCS+= resources.xml DOCS+= software-license.xml DOCS+= working-with-hats.xml INDEXLINK= internal.html DATA+= ssh-keys.asc .include "${DOC_PREFIX}/share/mk/web.site.mk" Index: head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml =================================================================== --- head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml (revision 53685) +++ head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml (revision 53686) @@ -1,268 +1,150 @@ ]> &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:

-

Reporting Instructions

- -

If you believe someone is violating the code of conduct we ask - that you report it to the &os; 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.

- -

If you believe anyone is in physical danger, please notify - appropriate law enforcement first.

- -

In your report please include:

- - - -

What happens after you file a report?

- -

You will receive an email from the &os; 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:

- - - -

If a member of the &os; 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:

- - - -

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.

- -

Finally, the committee will make a report on the situation to - the &os; 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 &os; Core - Team at core@freebsd.org - with your appeal and the Core Team will review the case.

+

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.

Index: head/en_US.ISO8859-1/htdocs/internal/conduct-reporting.xml =================================================================== --- head/en_US.ISO8859-1/htdocs/internal/conduct-reporting.xml (nonexistent) +++ head/en_US.ISO8859-1/htdocs/internal/conduct-reporting.xml (revision 53686) @@ -0,0 +1,142 @@ + + +]> + + + + &title; + + $FreeBSD$ + + + + +

&os; Code of Conduct Reporting Instructions

+ +

If you believe someone is violating the + code of conduct we ask + that you report it to the &os; 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.

+ +

If you believe anyone is in physical danger, please notify + appropriate law enforcement first.

+ +

In your report please include:

+ + + +

What happens after you file a report?

+ +

You will receive an email from the &os; 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:

+ + + +

If a member of the &os; 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:

+ + + +

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.

+ +

Finally, the committee will make a report on the situation to + the &os; 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 &os; Core + Team at core@freebsd.org + with your appeal and the Core Team will review the case.

+ + + Property changes on: head/en_US.ISO8859-1/htdocs/internal/conduct-reporting.xml ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property Index: head/en_US.ISO8859-1/htdocs/internal/policies.xml =================================================================== --- head/en_US.ISO8859-1/htdocs/internal/policies.xml (revision 53685) +++ head/en_US.ISO8859-1/htdocs/internal/policies.xml (revision 53686) @@ -1,78 +1,79 @@ ]> &title; $FreeBSD$

Committer's Guide

The Committer's Guide is an overall guide for all new committers, including both technical details and policy details. For the latter, see the chapters on Conventions and Traditions, Developer Relations, and The FreeBSD Committers' Big List Of Rules.

It contains almost everything a new committer to the FreeBSD Project needs to know. See the Documentation Project Primer and the Ports Guide, below, for more info.

General Policies

The FreeBSD Documentation Project

The FreeBSD Documentation Project Primer for New Contributors covers everything you will need to know in order to start contributing to the FreeBSD Documentation Project, from the tools and software you will be using (both mandatory and recommended) to the philosophy behind the Documentation Project.

The FreeBSD Doceng Team Charter describes the purpose of Doceng.

The FreeBSD Ports Guidelines

The FreeBSD Porter's Handbook is a general guide for FreeBSD ports committers, including both technical information and policy guidelines.

The Ports Management Team has a separate page with policies and other information related to the FreeBSD Ports Collection.

FreeBSD Internal Home