From 92760f80dc79e8750e88f221b4776f798cd3c7c0 Mon Sep 17 00:00:00 2001 From: Tim Bannister Date: Thu, 30 May 2019 03:32:20 +0100 Subject: [PATCH] Update code of conduct based on upstream changes (#14612) Level with upstream commit 214585e24aab747fb85c2ea44fbf4a2442e30de6 --- content/en/community/code-of-conduct.md | 2 +- content/en/community/static/cncf-code-of-conduct.md | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/content/en/community/code-of-conduct.md b/content/en/community/code-of-conduct.md index 09544efe48..5dd0cb28e8 100644 --- a/content/en/community/code-of-conduct.md +++ b/content/en/community/code-of-conduct.md @@ -11,7 +11,7 @@ css: /css/community.css Kubernetes follows the CNCF Code of Conduct. The text of the CNCF CoC is replicated below, as of -commit 0ce4694. +commit 214585e. If you notice that this is out of date, please file an issue. diff --git a/content/en/community/static/cncf-code-of-conduct.md b/content/en/community/static/cncf-code-of-conduct.md index 3ee025ba34..05aefcc9fe 100644 --- a/content/en/community/static/cncf-code-of-conduct.md +++ b/content/en/community/static/cncf-code-of-conduct.md @@ -34,8 +34,7 @@ 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 -the [Kubernetes Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) . +Instances of abusive, harassing, or otherwise unacceptable behavior in Kubernetes may be reported by contacting the [Kubernetes Code of Conduct Committee](https://git.k8s.io/community/committee-code-of-conduct) via . For other projects, please contact a CNCF project maintainer or our mediator, Mishi Choudhary . This Code of Conduct is adapted from the Contributor Covenant (http://contributor-covenant.org), version 1.2.0, available at @@ -43,4 +42,4 @@ http://contributor-covenant.org/version/1/2/0/ ### CNCF Events Code of Conduct -CNCF events are governed by the Linux Foundation [Code of Conduct](http://events.linuxfoundation.org/events/cloudnativecon/attend/code-of-conduct) available on the event page. This is designed to be compatible with the above policy and also includes more details on responding to incidents. +CNCF events are governed by the Linux Foundation [Code of Conduct](https://events.linuxfoundation.org/code-of-conduct/) available on the event page. This is designed to be compatible with the above policy and also includes more details on responding to incidents.