Skip to content

Commit aec54cd

Browse files
lady3beangnarf
authored andcommitted
Conduct: many small edits for grammar and style
NB: It is not incorrect to place a period after "etc." at the end of a parenthetical phrase that is also the end of the sentence, as in: "(e.g. mailing lists, IRC, etc.)." It just looks bad, and can be avoided.
1 parent 30e6a05 commit aec54cd

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

pages/conduct/enforcement-manual.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"pageTemplate": "page-conduct.php"
44
}</script>
55

6-
This is the enforcement manual followed by jQuery's Code of Conduct Committee. It's used when we respond to an issue to make sure we're consistent and fair. It should be considered an internal document, but we're publishing it publicly in the interests of transparency.
6+
This is the enforcement manual followed by jQuery's Code of Conduct Committee. It's used when we respond to an issue to make sure we're consistent and fair. It should be considered an internal document, but we're publishing it publicly in the interest of transparency.
77

88
### The Code of Conduct Committee
99

@@ -13,7 +13,7 @@ The jQuery Foundation's Board of Directors ("the board") will establish this com
1313

1414
### How the committee will respond to reports
1515

16-
When a report is sent to the committee they will immediately reply to the report to confirm receipt. This reply must be sent within 24 hours, and the group should strive to respond much quicker than that.
16+
When a report is sent to the committee they will immediately reply to the report to confirm receipt. This reply must be sent within 24 hours, and the group should strive to respond more quickly than that.
1717

1818
See the [reporting guidelines](https://www.jquery.org/conduct/reporting/) for details of what reports should contain. If a report doesn't contain enough information, the committee will obtain all relevant data before acting. The committee is empowered to act on the jQuery Foundation's behalf in contacting any individuals involved to get a more complete account of events.
1919

@@ -24,7 +24,7 @@ The committee will then review the incident and determine, to the best of their
2424
* who, if anyone, was the bad actor
2525
* whether this is an ongoing situation, and there is a threat to anyone's physical safety
2626

27-
This information will be collected in writing, and whenever possible the group's deliberations will be recorded and retained (i.e. IRC transcripts, email discussions, recorded voice conversations, etc).
27+
This information will be collected in writing, and whenever possible the group's deliberations will be recorded and retained (e.g. IRC transcripts, email discussions, or recorded voice conversations).
2828

2929
The committee should aim to have a resolution agreed upon within one week. In the event that a resolution can't be determined in that time, the group will respond to the reporter(s) with an update and projected timeline for resolution.
3030

@@ -44,9 +44,9 @@ Possible responses may include:
4444

4545
* Taking no further action (if we determine no violation occurred).
4646
* A private reprimand from the committee to the individual(s) involved. In this case, the group chair will deliver that reprimand to the individual(s) over email, cc'ing the group.
47-
* A public reprimand. In this case, the group chair will deliver that reprimand in the same venue that the violation occurred (i.e. in IRC for an IRC violation; email for an email violation, etc.). The group may choose to publish this message elsewhere for posterity.
48-
* An imposed vacation (i.e. asking someone to "take a week off" from a mailing list or IRC). The group chair will communicate this "vacation" to the individual(s). They'll be asked to take this vacation voluntarily, but if they don't agree then a temporary ban may be imposed to enforce this vacation.
49-
* A permanent or temporary ban from some or all jQuery spaces (mailing lists, IRC, etc.). The group will maintain records of all such bans so that they may be reviewed in the future, extended to new jQuery fora, or otherwise maintained.
47+
* A public reprimand. In this case, the group chair will deliver that reprimand in the same venue that the violation occurred (e.g. in IRC for an IRC violation; email for an email violation). The group may choose to publish this message elsewhere for posterity.
48+
* An imposed vacation (e.g. asking someone to "take a week off" from a mailing list or IRC). The group chair will communicate this "vacation" to the individual(s). They'll be asked to take this vacation voluntarily, but if they don't agree then a temporary ban may be imposed to enforce this vacation.
49+
* A permanent or temporary ban from some or all jQuery spaces (including mailing lists and IRC). The group will maintain records of all such bans so that they may be reviewed in the future, extended to new jQuery fora, or otherwise maintained.
5050
* A request for a public or private apology. The chair will deliver this request. The group may, if it chooses, attach "strings" to this request: for example, the group may ask a violator to apologize in order to retain his or her membership on a mailing list.
5151

5252
Once a resolution is agreed upon, but before it is enacted, the committee will contact the original reporter and any other affected parties and explain the proposed resolution. The committee will ask if this resolution is acceptable, and must note feedback for the record. However, the committee is not required to act on this feedback.

pages/conduct/faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ This Code of Conduct is all about how we interact as a community. It's about say
2929

3030
Real-life events, however, require a bit more care. The jQuery Foundation wants to be sure that any events it funds have policies and procedures in place for handling harassment. It's especially important to us that real-life events take steps to protect the physical and mental security of their participants.
3131

32-
So the jQuery Foundation will require that any events it funds have some sort of anti- harassment policy in place. The jQuery Foundation thinks the [Ada Initiative's template](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy) is pretty good, but we're open to alternatives.
32+
So the jQuery Foundation will require that all events it funds have some sort of anti- harassment policy in place. The jQuery Foundation thinks the [Ada Initiative's template](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy) is pretty good, but we're open to alternatives.
3333

3434
### What happens if someone violates the Code of Conduct?
3535

36-
Our intent is that the anyone in the community can stand up for this code, and direct people who're unaware to this document. If that doesn't work, or if you need more help, you can contact [conduct@jquery.com](mailto:conduct@jquery.com). For more details please see our [Reporting Guidelines](https://www.jquery.org/conduct/reporting/)
36+
Our intent is that the anyone in the community can stand up for this Code, and direct people who're unaware to this document. If that doesn't work, or if you need more help, you can contact [conduct@jquery.com](mailto:conduct@jquery.com). For more details please see our [Reporting Guidelines](https://www.jquery.org/conduct/reporting/)
3737

3838
### Why do we need a Code of Conduct? Everyone knows not to be a jerk.
3939

4040
Sadly, not everyone knows this.
4141

42-
However, even if everyone was kind, everyone was compassionate, and everyone was familiar with codes of conduct it would still be incumbent upon our community to publish our own. Maintaining a code of conduct forces us to consider and articulate what kind of community we want to be, and serves as a constant reminder to put our best foot forward. But most importantly, it serves as a signpost to people looking to join our community that we feel these values are important.
42+
However, even if everyone were kind, compassionate, and familiar with codes of conduct, it would still be incumbent upon our community to publish our own. Maintaining a code of conduct forces us to consider and articulate what kind of community we want to be, and serves as a constant reminder to put our best foot forward. But most importantly, it serves as a signpost to people looking to join our community that we feel these values are important.
4343

4444
### This is censorship! I have the right to say whatever I want!
4545

pages/conduct/reporting.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ If you believe someone is violating the code of conduct we ask that you report i
99

1010
In your report please include:
1111

12-
* Your contact info (so we can get in touch with you if we need to follow up)
12+
* Your contact info (so we can get in touch with you if we need to follow up).
1313
* Names (real, nicknames, or pseudonyms) of any individuals involved. If there were other witnesses besides you, please try to include them as well.
1414
* When and where the incident occurred. Please be as specific as possible.
1515
* Your account of what occurred. If there is a publicly available record (e.g. a mailing list archive or a public IRC logger) please include a link. Screenshots can be useful in the case something is edited or deleted before action is taken.
@@ -19,7 +19,7 @@ In your report please include:
1919

2020
### What happens after you file a report?
2121

22-
You will receive an email from the jQuery Foundation Code of Conduct Working Group acknowledging receipt immediately. We promise to acknowledge receipt within 24 hours (and will aim for much quicker than that).
22+
You will receive an email from the jQuery Foundation Code of Conduct Working Group acknowledging receipt immediately. We promise to acknowledge receipt within 24 hours (and will aim to do so more quickly than that).
2323

2424
Members of the committee will immediately meet to review the incident and determine:
2525

@@ -30,13 +30,13 @@ Members of the committee will immediately meet to review the incident and determ
3030

3131
If this is determined to be an ongoing incident or a threat to physical safety, the immediate priority will be to protect everyone involved. This means we may delay an "official" response until we believe that the situation has ended and that everyone is physically safe.
3232

33-
Once the committee has a complete account of the events they will make a decision as to how to response. Responses may include:
33+
Once the committee has a complete account of the events they will make a decision as to how to respond. Responses may include:
3434

3535
* Nothing (if we determine no violation occurred).
3636
* A private reprimand from the committee to the individual(s) involved.
3737
* A public reprimand.
38-
* An imposed vacation (i.e. asking someone to "take a week off" from a mailing list or IRC).
39-
* A permanent or temporary ban from some or all jQuery spaces (mailing lists, IRC, etc.)
38+
* An imposed vacation (e.g. asking someone to "take a week off" from a mailing list or IRC).
39+
* A permanent or temporary ban from some or all jQuery spaces (including online spaces such as mailing lists and IRC).
4040
* A request for a public or private apology.
4141

4242
We'll respond within one week to the person who filed the report with either a resolution or an explanation of why the situation is not yet resolved.

0 commit comments

Comments
 (0)