Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Minor typos fixed and some wording amended

  • Loading branch information...
commit 9c1f4ee649723b9bb7cc5e8d601077ea94ad24ea 1 parent 81ace90
@evildmp evildmp authored
Showing with 30 additions and 18 deletions.
  1. +30 −18 templates/conduct/enforcement.html
View
48 templates/conduct/enforcement.html
@@ -5,10 +5,10 @@
{% block content %}
<h1>Django Code of Conduct - Enforcement Manual</h1>
-<h2 class="deck">This is enforcement manual followed by Django's Code of
+<h2 class="deck">This is the enforcement manual followed by Django's Code of
Conduct Working Group. It's used when we respond to an issue to make sure we're
-consistant and fair. It should be considered an internal document, but we're
-publishing it publically in the interests of transparancy.<h2>
+consistent and fair. It should be considered an internal document, but we're
+publishing it publicly in the interests of transparency.<h2>
<h3>The Conduct Working Group</h3>
@@ -34,10 +34,10 @@ <h2 class="deck">This is enforcement manual followed by Django's Code of
<p>The working group will then review the incident and determine, to the best of their ability:
<ul>
- <li>What happened.</li>
- <li>Whether this event constitutes a code of conduct violation.</li>
- <li>Who the bad actor was.</li>
- <li>Whether this is an ongoing situation, or if there is a threat to anyone's physical safety.</li>
+ <li>what happened</li>
+ <li>whether this event constitutes a code of conduct violation</li>
+ <li>who, if anyone, was the bad actor</li>
+ <li>whether this is an ongoing situation, and there is a threat to anyone's physical safety</li>
</ul>
</p>
@@ -47,13 +47,12 @@ <h2 class="deck">This is enforcement manual followed by Django's Code of
<p>The working group 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.
-Handling ongoing incidents or safety issues</p>
+respond to the reporter(s) with an update and projected timeline for resolution.</p>
<h3>Acting Unilaterally</h3>
-<p>If the act is ongoing (such as someone being harassing in #django), or involves
-a threat to anyone's safety (i.e. threats of violence), any working group member
+<p>If the act is ongoing (such as someone engaging in harrassment in #django), or involves
+a threat to anyone's safety (e.g. threats of violence), any working group member
may act immediately (before reaching consensus) to end the situation. In ongoing
situations, any member may at their discretion employ any of the tools available
to the working group, including bans and blocks.</p>
@@ -62,7 +61,7 @@ <h2 class="deck">This is enforcement manual followed by Django's Code of
and should -- act unilaterally to protect safety. This can include contacting
law enforcement (or other local personnel) and speaking on behalf of the DSF.</p>
-<p>In situations where an individual group members acts unilaterally, they must
+<p>In situations where an individual group member acts unilaterally, they must
report their actions to the working group for review within 24 hours.</p>
<h3>Resolutions</h3>
@@ -73,12 +72,25 @@ <h2 class="deck">This is enforcement manual followed by Django's Code of
<p>Possible responses may include:
<ul>
- <li>Nothing (if we determine no violation occurred).</li>
- <li>A private reprimand from the working group 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.</li>
- <li>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.</li>
- <li>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.</li>
- <li>A permanent or temporary ban from some or all Django 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 Django fora, or otherwise maintained.</li>
- <li>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 apoligize in order to retain his membership on a mailing list.</li>
+ <li>Taking no further action (if we determine no violation occurred).</li>
+ <li>A private reprimand from the working group 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.</li>
+ <li>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.</li>
+ <li>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.</li>
+ <li>A permanent or temporary ban from some or all Django 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 Django fora, or otherwise maintained.</li>
+ <li>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.</li>
</ul>
</p>
Please sign in to comment.
Something went wrong with that request. Please try again.