Skip to content

Commit

Permalink
Fixing typos + grammar
Browse files Browse the repository at this point in the history
Co-authored-by: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
  • Loading branch information
tobie and VoltrexKeyva committed Feb 23, 2024
1 parent 3cf7343 commit 9a76018
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions conduct/COC_POLICY.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ A record of all communications related to an incident report, escalation request

## Confidentiality

The identity of the harmed individual(s) and the and reporter(s) of an incident report must be kept confidential.
The identity of the harmed individual(s) and the reporter(s) of an incident report must be kept confidential.

The identity of the accused individual should be kept confidential. However, incidents requiring immediate action (e.g. to prevent further harm) and implementing the decision resulting from the incident management process might require sharing the identity of the accused individual beyond the people involved in the incident management process itself. Additionally, the obligation of confidentiality towards the accused individul ends if the accused individul chooses to disclose the information publicly. In all cases however, care should be taken to limit information sharing to what is strictly necessary to address the issue at hand and avoid making that sharing retaliatory.
The identity of the accused individual should be kept confidential. However, incidents requiring immediate action (e.g. to prevent further harm) and implementing the decision resulting from the incident management process might require sharing the identity of the accused individual beyond the people involved in the incident management process itself. Additionally, the obligation of confidentiality towards the accused individual ends if the accused individual chooses to disclose the information publicly. In all cases, however, care should be taken to limit information sharing to what is strictly necessary to address the issue at hand and avoid making that sharing retaliatory.

## Conflict of Interest

Expand All @@ -69,9 +69,9 @@ Any person involved with the management of an incident report must immediately n

### Incident management processes

The Cross Project Council (CPC) defines, documents, and maintains all processes necessary for the management of incident reports and the enforcement of the code of code of conduct and of this policy through the [CoC Process for Incident Management](COC_PROCESS_FOR_INCIDENT_MANAGEMENT.md).
The Cross Project Council (CPC) defines, documents, and maintains all processes necessary for the management of incident reports and the enforcement of the code of conduct and this policy through the [CoC Process for Incident Management](COC_PROCESS_FOR_INCIDENT_MANAGEMENT.md).

The CPC works with the OpenJS Foundation staff to develop infrastructure and processes necessary to comply to the requirements of this policy, notably when it comes to record keeping, confidentiality, and transparency.
The CPC works with the OpenJS Foundation staff to develop the infrastructure and processes necessary to comply with the requirements of this policy, notably when it comes to record-keeping, confidentiality, and transparency.

### Code of Conduct Team (CoC Team)

Expand All @@ -91,7 +91,7 @@ Projects may opt-in to enforce the code of conduct themselves provided they meet

1. Commit to uphold the code of conduct.
2. Commit to uphold this policy.
3. Provide a general email address that incidents can be reported to and document it alongside the code of conduct.
3. Provide a general email address where incidents can be reported and document it alongside the code of conduct.
4. Define and publicly document a process by which the project selects people responsible for managing incident reports. For Impact and At Large projects, at least two people must be selected.
5. List the people responsible for managing incident reports alongside the code of conduct as outlined in the [Reporting incidents section](#reporting-incidents).
6. Publicly document their decision-making process for responding to incident reports.
Expand Down
14 changes: 7 additions & 7 deletions conduct/COC_TEAM_CHARTER.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The CoC Team's responsibilities are to:
- Handle code of conduct [incident reports][incident report].
- Handle code of conduct [escalation requests][escalation].
- Handle code of conduct [appeals][appeal].
- Keep the CPC up to date of cases requiring the CPC's attention.
- Keep the CPC up to date on cases requiring the CPC's attention.
- Provide regular transparency reports to the CPC.
- Uphold this charter, the [code of conduct][CoC], and the [code of conduct policy][CoC Policy].

Expand All @@ -37,13 +37,13 @@ The name and email address of the primary members are documented in the [code of

### Alternate community members

Alternate community members are CoC Team Members that are available as backup when there aren't enough primary community members available to [handle a case][#handling-cases].
Alternate community members are CoC Team Members who are available as backup when there aren't enough primary community members available to [handle a case][#handling-cases].

### Member selection

The Cross Project Council (CPC) will hold an annual selection process in order to select primary and alternate community members.

The CPC is responsible to ensure that the CoC Team is as representative and diverse as possible. To do so, the CPC commits to reach out proactively to individuals from underrepresented groups.
The CPC is responsible for ensuring that the CoC Team is as representative and diverse as possible. To do so, the CPC commits to reach out proactively to individuals from underrepresented groups.

Candidates can self-nominate to be selected as an alternate community member, a primary member, or both.

Expand All @@ -56,27 +56,27 @@ Primary and alternate community members of the CoC Team must:
* Commit to uphold the Foundation's [Code of Conduct][CoC]
* Commit to uphold the Foundation's [Code of Conduct Policy][CoC Policy]
* Commit to uphold this charter
* Be willing to treat every accused individuals in the same way regardless of the impact of their contributions to open source
* Be willing to treat every accused individual in the same way regardless of the impact of their contributions to open source

No two primary community members can work for the same employer.

### Term

Members of the CoC Team serve a one year term. There are no limits on the number of terms a CoC Team member may serve.
Members of the CoC Team serve a one-year term. There are no limits on the number of terms a CoC Team member may serve.

## Handling cases

Each appeal, escalation request, and incident report must be handled by a minimum of three (3) and a maximum of five (5) members.

At least two (2) of the members involved in handling a case must be community members and at least one (1) must be an OpenJS Foundation staff member.

If not enough primary community members are available to meet those requirements, primary members should involve one or more alternate community members. Similarily, if no OpenJSF staff primary member is available, another OpenJSF staff representative, choosen by the staff, should be involved instead.
If not enough primary community members are available to meet those requirements, primary members should involve one or more alternate community members. Similarly, if no OpenJSF staff primary member is available, another OpenJSF staff representative, chosen by the staff, should be involved instead.

Appeals to responses provided by the CoC Team itself should be handled by a different set of members than those responsible for the initial response.

## Decision making process

The CoC Team uses the Cross Project Council's [Decison Making Process][decision-making].
The CoC Team uses the Cross Project Council's [Decision Making Process][decision-making].


[CoC]: https://code-of-conduct.openjsf.org/
Expand Down

0 comments on commit 9a76018

Please sign in to comment.