From 612f9c2aa42ee0e1ce6c29e403c3863d05552486 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Mon, 15 Oct 2018 16:33:34 -0700 Subject: [PATCH] Use CoCC email for reporting CoC violations (#10621) * Use CoCC email for reporting CoC violations * Direct CoC concerns to the new committee --- CONTRIBUTING.md | 3 ++- content/en/community/_index.html | 4 ++-- content/en/community/code-of-conduct.md | 6 +++--- content/en/community/static/cncf-code-of-conduct.md | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13c07eb905..d5f2c4ce05 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,8 @@ These are just guidelines, not rules. Use your best judgment, and feel free to p ### Code of Conduct -Kubernetes follows the [Cloud Native Computing Foundation (CNCF) Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to Sarah Novotny [sarahnovotny@google.com](mailto:sarahnovotny@google.com) and/or Dan Kohn [dan@linuxfoundation.org](mailto:dan@linuxfoundation.org). +Kubernetes follows the [Cloud Native Computing Foundation (CNCF) Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to the +[Kubernetes Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) . ### Documentation and Site Decisions diff --git a/content/en/community/_index.html b/content/en/community/_index.html index 807faa6565..88cf6b07d5 100644 --- a/content/en/community/_index.html +++ b/content/en/community/_index.html @@ -44,8 +44,8 @@ cid: community enforces a Code of Conduct in all interactions. If you notice a violation of the Code of Conduct at an event or meeting, in Slack, or in another communication - mechanism, reach out to the - steering committee. + mechanism, reach out to the Kubernetes Code of Conduct Committee + conduct@kubernetes.io. Your anonymity will be protected.

diff --git a/content/en/community/code-of-conduct.md b/content/en/community/code-of-conduct.md index 3defdd4b72..ec85a0cf75 100644 --- a/content/en/community/code-of-conduct.md +++ b/content/en/community/code-of-conduct.md @@ -16,9 +16,9 @@ If you notice that this is out of date, please file an issue. If you notice a violation of the Code of Conduct at an event or meeting, in -Slack, or in another communication mechanism, reach out to the -steering committee. Your -anonymity will be protected. +Slack, or in another communication mechanism, reach out to +the [Kubernetes Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) . +Your anonymity will be protected.
{{< include "/static/cncf-code-of-conduct.md" >}} diff --git a/content/en/community/static/cncf-code-of-conduct.md b/content/en/community/static/cncf-code-of-conduct.md index e332919bca..3ee025ba34 100644 --- a/content/en/community/static/cncf-code-of-conduct.md +++ b/content/en/community/static/cncf-code-of-conduct.md @@ -34,7 +34,8 @@ Conduct may be permanently removed from the project team. This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a CNCF project maintainer, Sarah Novotny , and/or Dan Kohn . +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting +the [Kubernetes Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) . This Code of Conduct is adapted from the Contributor Covenant (http://contributor-covenant.org), version 1.2.0, available at