From nobody Thu Jun 22 05:25:48 2023 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qmpk46g66z4gXmk for ; Thu, 22 Jun 2023 05:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qmpk463dlz3My4; Thu, 22 Jun 2023 05:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687411548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LYTKuT9aZw3RZK07hQkufr9Z1Lv3zO0RX5lRiEWS3Gs=; b=QY06i+W+Qk3vFx+aF7lYBPOm7O+ftIavdGB6IQuF4uK4pcOpmf0wKTJQvd2aL6+2Jq+bQe 0gE39rMPdkg029vivSYLNvKsk9UDp1uHXhOjzRTqFpJFvjhQsH1xUOtJbvPjjwkCYv8rVX HZKBetHN6ReW6sLrkxqE8N1hrzOB6OuGWgB1BBT8pRetLmF4PEUOtOk3a8htC0eG6EiuRu RclhpbeMQAKn60YC2dqhF+Oq/SHGB0T75r/H67TmMYpEVP/uoidR6zqx5erE9F1nUaEjwi 3P6NaLnBh0dJBilGTRKitLap99Qo0itIOjZyzFwp3DLhqIvWB6A+syy2/hZREw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687411548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LYTKuT9aZw3RZK07hQkufr9Z1Lv3zO0RX5lRiEWS3Gs=; b=FgZZsb2wueiFKCwPo4aEBnvH3KnXT94NrVDPntyhGRxW3xlYM5HihGKPRHx23D2couGZhq uzQZr4srpwZpseh9Z+dPtW/IMq52J9ttIp0Fws3I5V3dZZPMER/uh1FPbu/gVf9+j1wmXr s0U02PHlZXUp0Q0C/oiYENWpDaKFOKmufwai22QsXtfePilvb3I8yrUH1KMdm9+8MkBMyh OUDYmFNFdui9qhnWPRhkNMGlKTPT0DyDYhY6s65yGzBIKEq3QzrskoPFUT7k1igXo5Nen9 jMXmHCE0NYwtfjd2tCgQwWk1N3eQfYzbaZ7NInI/jg5NiZ/3JTxM0OsXIqrcWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687411548; a=rsa-sha256; cv=none; b=WH5tw8xvNE+wLyVMKyuls/mLPOw11jIm415K+mRXz4sab/EFWcKR9dYqszWLcityFSQKQj tcoJ7/0NG04DKF2iQxAMNZf7gcoEapBnC1qnZksTfq1ie0Y5X/j2wrTmX84uJRQZrM4XBD +wlZ0oeU/hDKWTJFH/KwL/uEnmuLDWybihye5skjRggk/m+DsW4hUZWFGLRknGWgUQFmwp qpxmPQaqdfVQvInIsCYsZl/WzEVQ0KjfeYFJMK0H1hjaJ9I2e3Ky04EUm33CoflO5eGlNN OKkSSlT27MFmXSHz350xXx9V1Ii+6tSyLK9XdcO+1cJpFdOgtpySOXKI9PAPeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qmpk44fvgz1B6Q; Thu, 22 Jun 2023 05:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35M5PmKj009126; Thu, 22 Jun 2023 05:25:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35M5Pmwm009125; Thu, 22 Jun 2023 05:25:48 GMT (envelope-from git) Date: Thu, 22 Jun 2023 05:25:48 GMT Message-Id: <202306220525.35M5Pmwm009125@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 9e3690e5b6 - main - Coduct is now handled by the Core Team List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e3690e5b69c86c27b224197cea0ce4c14196bab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=9e3690e5b69c86c27b224197cea0ce4c14196bab 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 mailto:conduct@freebsd.org[conduct@FreeBSD.org] or the FreeBSD Core team mailto:core@freebsd.org[core@FreeBSD.org]. +If you have questions, please feel free to contact the FreeBSD Code of Conduct Committee by emailing mailto:conduct@freebsd.org[conduct@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.) 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 core@freebsd.org with your appeal and the Core Team will review the case.