git: 9e3690e5b6 - main - Coduct is now handled by the Core Team

From: Sergio Carlavilla Delgado <>
Date: Thu, 22 Jun 2023 05:25:48 UTC
The branch main has been updated by carlavilla:


commit 9e3690e5b69c86c27b224197cea0ce4c14196bab
Author:     Sergio Carlavilla Delgado <>
AuthorDate: 2023-06-22 05:23:22 +0000
Commit:     Sergio Carlavilla Delgado <>
CommitDate: 2023-06-22 05:25:39 +0000

    Coduct is now handled by the Core Team
    Approved by:    core@
 website/content/en/internal/code-of-conduct.adoc   | 2 +-
 website/content/en/internal/conduct-reporting.adoc | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/website/content/en/internal/code-of-conduct.adoc b/website/content/en/internal/code-of-conduct.adoc
index 601b344ed7..66781f8761 100644
--- a/website/content/en/internal/code-of-conduct.adoc
+++ b/website/content/en/internal/code-of-conduct.adoc
@@ -45,7 +45,7 @@ For more details please see our link:../conduct-reporting/[Reporting Guide].
 == Questions?
-If you have questions, please feel free to contact the FreeBSD Code of Conduct Committee by emailing[] or the FreeBSD Core team[].
+If you have questions, please feel free to contact the FreeBSD Code of Conduct Committee by emailing[].
 (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.)
diff --git a/website/content/en/internal/conduct-reporting.adoc b/website/content/en/internal/conduct-reporting.adoc
index 88bbfce5cb..ed9fe5b5a5 100644
--- a/website/content/en/internal/conduct-reporting.adoc
+++ b/website/content/en/internal/conduct-reporting.adoc
@@ -30,7 +30,7 @@ In your report please include:
 == 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.
+Since the FreeBSD Code of Conduct Committee is managed by the Core Team, you will receive an email from the Core Team within 48 hours indicating that the complaint has been received.
 The committee will meet as quickly as possible to review the incident and determine:
@@ -57,10 +57,4 @@ We will do our best to respond within one week to the person who filed the repor
 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.
-== Appeals
-Only permanent resolutions (such as bans) may be appealed.
-To appeal a decision of the CoC Committee, contact the FreeBSD Core Team at with your appeal and the Core Team will review the case.