Skip to content

Commit 52852c4

Browse files
committed
Update references to Contributor Covenant 2.0 for 2.1
Also auto removed trailing white space on save. Ignore white space to diff
1 parent 869acd1 commit 52852c4

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Foundation Code of Conduct Requirements
22

33
It is important that there be a Code of Conduct (CoC) which
4-
is documented and enforced for the OpenJS Foundation,
4+
is documented and enforced for the OpenJS Foundation,
55
hereinafter referred to as the "Foundation", and the
66
projects within it. This document defines the requirements
77
for a CoC for the Foundation and the projects which are part
@@ -11,7 +11,7 @@ of the foundation.
1111
## Code of Conduct
1212

1313
The Foundation has adopted the
14-
[Contributor Covenant v2.0](https://www.contributor-covenant.org/version/2/0/code_of_conduct/)
14+
[Contributor Covenant v2.1](https://www.contributor-covenant.org/version/2/1/code_of_conduct/)
1515
as its code of conduct and it applies to all foundation activities and spaces. In
1616
addition, projects joining the foundation are required to adopt this code of conduct
1717
within 3 months of joining the foundation.
@@ -23,12 +23,12 @@ the Code of Conduct.
2323
## Enforcement
2424

2525
For spaces managed by the Foundation, complaints can be forwarded to [email protected] and will
26-
be investigated by the Cross Project Council (CPC) or its delegates. All complaints will be reviewed,
26+
be investigated by the Cross Project Council (CPC) or its delegates. All complaints will be reviewed,
2727
investigated, and will result in a response that is deemed necessary and appropriate
2828
to the circumstances. The CPC is obligated to maintain confidentiality with regard
2929
to the reporter of an incident.
3030

31-
For spaces managed by member projects, the project must provide an email to which complaints
31+
For spaces managed by member projects, the project must provide an email to which complaints
3232
can be forwarded and document that complaints will be investigated and will result in a
3333
response that is deemed appropriate for the circumstances. Each project is free to
3434
implement enforcement of the Code of Conduct using processes appropriate for the size
@@ -49,7 +49,7 @@ report can be made to [email protected].
4949
All escalations will be reviewed and investigated by the Code of Conduct Panel (CoCP)
5050
and will result in a response that is deemed necessary and appropriate to the circumstances.
5151
The Code of Conduct panel is obligated to maintain confidentiality with regard
52-
to the reporter of an escalation.
52+
to the reporter of an escalation.
5353

5454
### Code of Conduct panel
5555

HANDLING_CODE_OF_CONDUCT_REPORTS.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ This document describes the proposed process for handling reports and escalation
44
This process covers two types of reports based on the [Foundation's Code of Conduct Requirements](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md):
55

66
* Reports for spaces managed by the Cross Project Council (CPC) which come in through `[email protected]`
7-
* Escalations which come in through `[email protected]`.
7+
* Escalations which come in through `[email protected]`.
88

99
Generally, reports to coc-escalation should refer to a report that was already submitted to:
1010

1111
12-
* one of the project's reporting emails
12+
* one of the project's reporting emails
1313
* explanation of why the reporter does not feel comfortable using the previous reporting emails for the initial report
1414

15-
If a report to coc-esclation does not include one of those, the reporter will be asked to to provide one of those three as the
15+
If a report to coc-esclation does not include one of those, the reporter will be asked to to provide one of those three as the
1616
reason for reporting to coc-escalation.
1717

1818
## Code of Conduct
1919

20-
The OpenJS Foundation and its member projects use the Contributor Covenant v2.0 as its Code of Conduct. Refer to the [Code of Conduct](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/CODE_OF_CONDUCT.md) for the full text of the CoC and the reporting and esclation procedures.
20+
The OpenJS Foundation and its member projects use the Contributor Covenant v2.1 as its Code of Conduct. Refer to the [Code of Conduct](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/CODE_OF_CONDUCT.md) for the full text of the CoC and the reporting and esclation procedures.
2121

2222
## Confidentiality and record-keeping
2323
Personal information is confidential. All reports should be recorded, together with the discussion of it. The following private repos will be used to record and discuss reports.
@@ -44,16 +44,16 @@ All members of the CPC are subscribed to the `[email protected]` mailing list.
4444
1. Information is discussed: The facts are discussed in context of opinions. This can be done in the issue for the report, or in a meeting in which case the key discussion points should then be added to the issue.
4545
1. An action to be taken is arrived at: The action to be taken is decided by consensus as per the standard CPC
4646
[Decision Making](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/CPC-CHARTER.md#section-9-decision-making) process.
47-
1. Resolution shared: The resolution is shared with the reporter or target by the contact person. If the reporter or target expresses concerns then the contact person will bring these back to the CPC members for further discussion. This cycle can continue until the CPC members reach consensus that the reporter or target's concerns have been adquately addressed. If no feedback is received within 7 days the resolution is considered as accepted.
47+
1. Resolution shared: The resolution is shared with the reporter or target by the contact person. If the reporter or target expresses concerns then the contact person will bring these back to the CPC members for further discussion. This cycle can continue until the CPC members reach consensus that the reporter or target's concerns have been adquately addressed. If no feedback is received within 7 days the resolution is considered as accepted.
4848
1. Final resolution: the resolution agreed by the CPC members is implemented and the outcome reported to the reporter or target by the main contact.
49-
49+
5050
## Reports to [email protected]
5151

5252
Note: We understand that the reporter and the target can be separate persons. In this case the CPC will communicate with the reporter unless the target gives permission for the CPC to communicate with them.
5353

5454
All members of the [Code of Conduct Panel (CoCP)](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md#code-of-conduct-panel)
5555
are subscribed to the [email protected] mailing list. The current list of members is documented in ./CODE_OF_CONDUCT_PANEL_MEMERS.md.
56-
56+
5757
When a report is received the following actions will be taken:
5858

5959
* One of the Code of Conduct Panel (CoCP) members will respond to the reporter or target confirming that the report has been received. When possible the same person who responds initially will act as the point of contact for future conversations.
@@ -67,6 +67,6 @@ When a report is received the following actions will be taken:
6767
[Decision Making](https://github.com/openjs-foundation/cross-project-council/blob/HEAD/CPC-CHARTER.md#section-9-decision-making) process substituting in CoCP for references to the CPC.
6868
1. The proposed action is discussed with the leadership for the space to which the report applies (ex CPC or member
6969
project leadership). If the leadership representatives expresses concerns then the contact person will bring these back to the CoCP members for further discussion. This cycle can continue until the CoCP members reach consensus that the leadership representatives concerns have been adequately addressed.
70-
1. Resolution shared: The resolution is shared with the reporter or target by the contact person. If the reporter or target expresses concerns then the contact person will bring these back to the CPC members for further discussion. This cycle can continue until the CPC members reach consensus that the reporter or target's concerns have been adquately addressed. If no feedback is received within 7 days the resolution is considered as accepted.
70+
1. Resolution shared: The resolution is shared with the reporter or target by the contact person. If the reporter or target expresses concerns then the contact person will bring these back to the CPC members for further discussion. This cycle can continue until the CPC members reach consensus that the reporter or target's concerns have been adquately addressed. If no feedback is received within 7 days the resolution is considered as accepted.
7171
1. Final resolution: the resolution agreed by the CoCP members is implemented and the outcome reported back to the reporter or target bythe main contact.
72-
72+

0 commit comments

Comments
 (0)