diff --git a/content/en/community/code-of-conduct.md b/content/en/community/code-of-conduct.md index 84c95370a33..d9c3aa8a457 100644 --- a/content/en/community/code-of-conduct.md +++ b/content/en/community/code-of-conduct.md @@ -10,11 +10,12 @@ community_styles_migrated: true Kubernetes follows the CNCF Code of Conduct. The text of the CNCF CoC is replicated below, as of -commit 71b12a2. +commit d1aa4b995. 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
diff --git a/content/en/community/static/cncf-code-of-conduct.md b/content/en/community/static/cncf-code-of-conduct.md
index fb3202b24a2..f1f58084be4 100644
--- a/content/en/community/static/cncf-code-of-conduct.md
+++ b/content/en/community/static/cncf-code-of-conduct.md
@@ -1,6 +1,6 @@
-## CNCF Community Code of Conduct v1.1
+## CNCF Community Code of Conduct v1.2
### Contributor Code of Conduct
@@ -13,7 +13,7 @@ We are committed to making participation in the CNCF community a harassment-free
sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
religion, or nationality.
-## Scope
+## Scope
This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
@@ -44,24 +44,23 @@ Examples of unacceptable behavior include:
* Other conduct which could reasonably be considered inappropriate in a
professional setting
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct.
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct.
By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect
-of managing this project.
+of managing this project.
Project maintainers who do not follow or enforce the Code of
Conduct may be permanently removed from the project team.
-## Reporting
+## Reporting
-For incidents occurring in the Kubernetes community, contact the [Kubernetes Code of Conduct Committee](https://git.k8s.io/community/committee-code-of-conduct) via