Merge pull request #36272 from ydFu/20220825-code-of-conduct

Update code of conduct based on upstream changes

Author: k8s-ci-robot

content/en/community/code-of-conduct.md

@@ -10,11 +10,12 @@ community_styles_migrated: true
 Kubernetes follows the
 <a href="https://github.com/cncf/foundation/blob/main/code-of-conduct.md">CNCF Code of Conduct</a>.
 The text of the CNCF CoC is replicated below, as of
-<a href="https://github.com/cncf/foundation/blob/71b12a2f8b4589788ef2d69b351a3d035c68d927/code-of-conduct.md">commit 71b12a2</a>.
+<a href="https://github.com/cncf/foundation/blob/d1aa4b995b2eb6a665a0bf0c76f609508d6ec15a/code-of-conduct.md">commit d1aa4b995</a>.
 If you notice that this is out of date, please
 <a href="https://github.com/kubernetes/website/issues/new">file an issue</a>.
 </p>
 
+
 <p>
 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

content/en/community/static/cncf-code-of-conduct.md

@@ -1,6 +1,6 @@
 <!-- Do not edit this file directly. Get the latest from
      https://github.com/cncf/foundation/blob/main/code-of-conduct.md -->
-## 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 <[email protected]>. You can expect a response within three business days.
+For incidents occuring in the Kubernetes community, contact the [Kubernetes Code of Conduct Committee](https://git.k8s.io/community/committee-code-of-conduct) via <[email protected]>. You can expect a response within three business days.
 
-For other projects, please contact the CNCF staff via <[email protected]>. You can expect a response within three business days.
+For other projects, or for incidents that are project-agnostic or impact multiple CNCF projects, please contact the [CNCF Code of Conduct Committee](https://www.cncf.io/conduct/committee/) via [email protected].  Alternatively, you can contact any of the individual members of the [CNCF Code of Conduct Committee](https://www.cncf.io/conduct/committee/) to submit your report. For more detailed instructions on how to submit a report, including how to submit a report anonymously, please see our [Incident Resolution Procedures](https://www.cncf.io/conduct/procedures/). You can expect a response within three business days.
 
-In matters that require an outside mediator, CNCF has retained Mishi Choudhary ([email protected]). Use of an outside mediator can be requested when reporting or used at CNCF staff's discretion. In general, contacting <[email protected]> directly is preferred.
+## Enforcement 
 
+The Kubernetes project's [Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) enforces code of conduct issues for the Kubernetes project.
 
-## Enforcement
-
-The Kubernetes project's [Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) enforces code of conduct issues. For all other projects, the CNCF enforces code of conduct issues.
+For all projects that do not have their own Code of Conduct Committee or other Code of Conduct incident responders, and for incidents that are project-agnostic or impact multiple projects, the [CNCF Code of Conduct Committee](https://www.cncf.io/conduct/committee/) enforces code of conduct issues. For more information, see our [Jurisdiction and Escalation Policy](https://www.cncf.io/conduct/jurisdiction/)
 
 Both bodies try to resolve incidents without punishment, but may remove people from the project or CNCF communities at their discretion.