Index: head/en_US.ISO8859-1/htdocs/internal/Makefile =================================================================== --- head/en_US.ISO8859-1/htdocs/internal/Makefile +++ head/en_US.ISO8859-1/htdocs/internal/Makefile @@ -11,6 +11,7 @@ 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 Index: head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml =================================================================== --- head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml +++ head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml @@ -111,128 +111,10 @@
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:
- -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.
- -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.
+The reporting process is documented at 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:
+ +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.
+ +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.
+ + + Index: head/en_US.ISO8859-1/htdocs/internal/policies.xml =================================================================== --- head/en_US.ISO8859-1/htdocs/internal/policies.xml +++ head/en_US.ISO8859-1/htdocs/internal/policies.xml @@ -35,6 +35,7 @@