Skip to content

Commit

Permalink
Various cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
tobie committed Nov 22, 2023
1 parent 1a4a8ec commit b692f74
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
23 changes: 12 additions & 11 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
* **Webdriver.io:** [contact TSC reps](https://github.com/webdriverio/webdriverio/blob/HEAD/AUTHORS.md)
* **Webhint:** <support@webhint.io>

In case of a conflict of interest or if the report is not handled appropriately, you may [escalate the report][escalation] to the [Code of Conduct Team (CoC Team)][CoC Team] by emailing <coc-escalation@lists.openjsf.org> or by contacting any if its members by email.
2. **To report any other incident** (for example: in an OpenJS Foundation project not listed above, in a Collab Space, in the Cross Project Council, or during an event), please email the [Code of Conduct Team (CoC Team)][CoC Team] at <report@lists.openjsf.org> or contact any if its members by email.
In case of a conflict of interest or if the report is not handled appropriately, you may [escalate the report][escalation] to the [Code of Conduct Team (CoC Team)][CoC Team] by emailing <coc-escalation@lists.openjsf.org> or by contacting any if its members.
2. **To report any other incident** (for example: in an OpenJS Foundation project not listed above, in a Collab Space, in the Cross Project Council, or during an event), please email the [Code of Conduct Team (CoC Team)][CoC Team] at <report@lists.openjsf.org> or contact any if its members.

### Appeal a decision

The victim(s) and offender(s) have thirty (30) days to appeal the decision made in response to an incident report if they believe the process was not properly followed. Appeals are not suspensive.

To appeal a decision, please email the [Code of Conduct Team (CoC Team)][CoC Team] at <coc-appeal@lists.openjsf.org> or contact any if its members by email. TODO: make sure this email exists.
To [appeal][] a decision, please email the [Code of Conduct Team (CoC Team)][CoC Team] at <coc-appeal@lists.openjsf.org>. TODO: create this address

## Code of Conduct Team (CoC Team)

The Code of Conduct Team (CoC Team) is a foundation-wide team established to manage code of conduct incident reports across the whole foundation (except for [projects who have opted-in][] to manage reports directly), escalation of reports managed by projects, and appeals to decisions made in response to incidents. The CoC Team is currently composed of:
The Code of Conduct Team (CoC Team) is a foundation-wide team established to manage code of conduct incident reports across the whole foundation (except for [projects who have opted-in][opted-in] to manage reports directly), escalation of reports managed by projects, and appeals to decisions made in response to incidents. The CoC Team is currently composed of:

- Robin Ginn (OpenJSF Executive Director) <TODO:email>
- Kylie Wagar-Dirks (OpenJSF Marketing Lead) <TODO:email>
- Joe Sepi (Cross Project Council Chair) <TODO:email>
- Robin Ginn (OpenJSF Executive Director) <rginn@linuxfoundation.org>
- Kylie Wagar-Dirks (OpenJSF Marketing Lead) <kwagar@linuxfoundation.org>
- Joe Sepi (Cross Project Council Chair) <sepi@joesepi.com>

You may contact the CoC Team at <report@lists.openjsf.org> or contact any of its members by email.
You may contact the CoC Team at <report@lists.openjsf.org> or contact any of its members.

## More Info

Expand Down Expand Up @@ -172,7 +172,8 @@ For answers to common questions about this code of conduct, see the FAQ at
[Mozilla CoC]: https://github.com/mozilla/diversity
[FAQ]: https://www.contributor-covenant.org/faq
[translations]: https://www.contributor-covenant.org/translations
[escalation]: #TODO
[CoC Team]: #TODO
[opted-in]: #TODO
[escalation]: https://github.com/openjs-foundation/cross-project-council/blob/main/conduct/COC_POLICY.md#escalation
[appeal]: https://github.com/openjs-foundation/cross-project-council/blob/main/conduct/COC_POLICY.md#appeals
[CoC Team]: https://github.com/openjs-foundation/cross-project-council/blob/main/conduct/COC_POLICY.md#code-of-conduct-team-coc-team
[opted-in]: https://github.com/openjs-foundation/cross-project-council/blob/main/conduct/COC_POLICY.md#delegation-to-projects

4 changes: 2 additions & 2 deletions conduct/COC_POLICY.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ The structure of the CoC Team and the process by which its members are chosen ar

The current composition of the CoC Team is available in the [code of conduct][CoC] itself along with means to contact by email the whole CoC Team and each of it members individually.

The CoC Team is responsible for maintaining and applying the [incident mangement processes][].
The CoC Team is responsible for maintaining and applying the [incident management processes][].

The CoC Team is empowered to involve external people to resolve an issue provided these abide by the code of conduct and by this policy.

Expand Down Expand Up @@ -96,4 +96,4 @@ Appeals are not suspensive.
[CoC]: https://code-of-conduct.openjsf.org/
[Charter]: https://github.com/openjs-foundation/cross-project-council/blob/main/CPC-CHARTER.md
[CoC Team processes]: https://github.com/openjs-foundation/cross-project-council/blob/main/conduct/COC_PROCESS_FOR_COC_TEAM.md
[incident mangement processes]: https://github.com/openjs-foundation/cross-project-council/blob/main/conduct/COC_PROCESS_FOR_INCIDENT_MANAGEMENT.md
[incident management processes]: https://github.com/openjs-foundation/cross-project-council/blob/main/conduct/COC_PROCESS_FOR_INCIDENT_MANAGEMENT.md

0 comments on commit b692f74

Please sign in to comment.