diff options
| author | Carolyn Van Slyck <me@carolynvanslyck.com> | 2018-10-16 10:28:04 -0700 |
|---|---|---|
| committer | k8s-ci-robot <k8s-ci-robot@users.noreply.github.com> | 2018-10-16 10:28:04 -0700 |
| commit | 98964d5aaf72a0eb42906f9fe23297660a0caac3 (patch) | |
| tree | 9893a19b4d9a220844dd1e9fb4efc6d3cd039782 | |
| parent | be110cb37c4f9fe9b9a8b1c0b2092f5b1ff583fc (diff) | |
Update Code of Conduct page with new email (#2806)
* Update Code of Conduct page with new email
Now that we have a Code of Conduct Committee for Kubernetes, people should
contact our private email list going forward with any problems.
* Incorporate review feedback
| -rw-r--r-- | committee-code-of-conduct/README.md | 2 | ||||
| -rw-r--r-- | communication/moderation.md | 4 | ||||
| -rw-r--r-- | contributors/guide/contributor-cheatsheet.md | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md index 6d602762..7f6902d5 100644 --- a/committee-code-of-conduct/README.md +++ b/committee-code-of-conduct/README.md @@ -11,4 +11,4 @@ The members and their terms are as follows: Please see the [bootstrapping document](./bootstrapping-process.md) for more information on how members are picked, their responsibilities, and how the committee will initially function. -_More information on how to contact this committee and learn about its process to come in the near future. For now, any Code of Conduct or Code of Conduct Committee concerns can be directed to steering-private@kubernetes.io_ +_More information on how to contact this committee and learn about its process to come in the near future. For now, any Code of Conduct or Code of Conduct Committee concerns can be directed to <conduct@kubernetes.io>_. diff --git a/communication/moderation.md b/communication/moderation.md index 6118b12b..ed21a7b2 100644 --- a/communication/moderation.md +++ b/communication/moderation.md @@ -21,7 +21,7 @@ Moderators _MUST_: - Take care of spam as soon as possible, which may mean taking action by removing a member from that resource. - Foster a safe and productive environment by being aware of potential multiple cultural differences between Kubernetes community members. - Understand that you might be contacted by moderators, community managers, and other users via private email or a direct message. -- Report egregious behavior to steering@k8s.io. +- Report violations of the Code of Conduct to <conduct@kubernetes.io>. Moderators _SHOULD_: @@ -34,7 +34,7 @@ Moderators _SHOULD_: ## Violations -The Kubernetes [Steering Committee](https://github.com/kubernetes/steering) will have the final authority regarding escalated moderation matters. Violations of the Code of Conduct will be handled on a case by case basis. Depending on severity this can range up to and including removal of the person from the community, though this is extremely rare. +The Kubernetes [Code of Conduct Committee](https://git.k8s.io/community/committee-code-of-conduct) will have the final authority regarding escalated moderation matters. Violations of the Code of Conduct will be handled on a case by case basis. Depending on severity this can range up to and including removal of the person from the community, though this is extremely rare. ## Specific Guidelines diff --git a/contributors/guide/contributor-cheatsheet.md b/contributors/guide/contributor-cheatsheet.md index 696e59e6..180a368f 100644 --- a/contributors/guide/contributor-cheatsheet.md +++ b/contributors/guide/contributor-cheatsheet.md @@ -52,6 +52,7 @@ A list of common resources when contributing to Kubernetes. - steering@kubernetes.io - Mail the steering committee. Public address with public archive. - steering-private@kubernetes.io - Mail the steering committee privately, for sensitive items. - helpdesk@rt.linuxfoundation.org - Mail the LF helpdesk for help with CLA issues. +- conduct@kubernetes.io - Contact the Code of Conduct committee, private mailing list. ## Other |