Skip to content

Commit f56ce01

Browse files
ontowheesarahboyce
authored andcommitted
Remove references to IRC from code of conduct
Co-authored-by: Sarah Boyce <[email protected]>
1 parent 1c8d4f8 commit f56ce01

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

djangoproject/templates/conduct/enforcement.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ <h3>{% translate "How the committee will respond to reports" %}</h3>
6464
<p>
6565
{% blocktranslate trimmed %}
6666
This information will be collected in writing, and whenever possible the
67-
committee's deliberations will be recorded and retained (i.e. IRC transcripts, email
67+
committee's deliberations will be recorded and retained (i.e. chat transcripts, email
6868
discussions, recorded voice conversations, etc).
6969
{% endblocktranslate %}</p>
7070

@@ -79,7 +79,7 @@ <h3>{% translate "Acting Unilaterally" %}</h3>
7979

8080
<p>
8181
{% blocktranslate trimmed %}
82-
If the act is ongoing (such as someone engaging in harassment in #django), or involves
82+
If the act is ongoing (such as someone engaging in harassment on the forum), or involves
8383
a threat to anyone's safety (e.g. threats of violence), any committee member
8484
may act immediately (before reaching consensus) to end the situation. In ongoing
8585
situations, any member may at their discretion employ any of the tools available
@@ -117,18 +117,18 @@ <h3>{% translate "Resolutions" %}</h3>
117117
<li>
118118
{% blocktranslate trimmed %}
119119
A public reprimand. In this case, a committee member will deliver that reprimand
120-
in the same venue that the violation occurred (i.e. in IRC for an IRC violation;
120+
in the same venue that the violation occurred (i.e. in the forum for a forum violation;
121121
email for an email violation, etc.). The committee may choose to publish this message
122122
elsewhere for posterity.{% endblocktranslate %}</li>
123123
<li>
124124
{% blocktranslate trimmed %}
125-
An imposed vacation (i.e. asking someone to "take a week off" from the forum
126-
or IRC). A committee member will communicate this "vacation" to the individual(s).
125+
An imposed vacation (i.e. asking someone to "take a week off" from the forum).
126+
A committee member will communicate this "vacation" to the individual(s).
127127
They'll be asked to take this vacation voluntarily, but if they don't agree then
128128
a temporary ban may be imposed to enforce this vacation.{% endblocktranslate %}</li>
129129
<li>
130130
{% blocktranslate trimmed %}
131-
A permanent or temporary ban from some or all Django spaces (forum, IRC,
131+
A permanent or temporary ban from some or all Django spaces (the forum,
132132
etc.). The committee will maintain records of all such bans so that they may be
133133
reviewed in the future, extended to new Django fora, or otherwise maintained.
134134
{% endblocktranslate %}</li>

djangoproject/templates/conduct/faq.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ <h3 id="what-does-it-mean">{% blocktranslate %}What does it mean to "adopt" a Co
5757

5858
<p>
5959
{% blocktranslate trimmed %}
60-
In practice, this means Django Forum, the various Django IRC channels (<tt>#django</tt>, <tt>#django-dev</tt>, etc.), bug
61-
tracking and code review tools, and "official" Django events such as sprints.
62-
In addition, violations of this code outside these spaces may affect a person's
63-
ability to participate within them.{% endblocktranslate %}</p>
60+
In practice, this means the Django forum, bug tracking and code review tools, and
61+
"official" Django events such as DjangoCons. In addition, violations of this code
62+
outside these spaces may affect a person's ability to participate within them.
63+
{% endblocktranslate %}</p>
6464

6565
<h3 id="dsf-events">{% translate "What about events funded by the Django Software Foundation?" %} <a class="plink" href="#dsf-events"></a></h3>
6666
<p>

djangoproject/templates/conduct/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h1>{% translate "Django Code of Conduct" %}</h1>
3636
<p>
3737
{% blocktranslate trimmed %}
3838
This code of conduct applies to all spaces managed by the Django project or
39-
Django Software Foundation. This includes IRC, the forum, the issue
39+
Django Software Foundation. This includes the issue
4040
tracker, DSF events, and any other forums created by the project team
4141
which the community uses for communication. In addition, violations of this code
4242
outside these spaces may affect a person's ability to participate within them.

djangoproject/templates/conduct/reporting.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ <h1>{% translate "Django Code of Conduct - Reporting Guide" %}</h1>
4141
<li>{% translate "Your contact info (so we can get in touch with you if we need to follow up)" %}</li>
4242
<li>{% translate "Names (real, nicknames, or pseudonyms) of any individuals involved. If there were other witnesses besides you, please try to include them as well." %}</li>
4343
<li>{% translate "When and where the incident occurred. Please be as specific as possible." %}</li>
44-
<li>{% translate "Your account of what occurred. If there is a publicly available record (e.g. the forum or a public IRC logger) please include a link." %}</li>
44+
<li>{% translate "Your account of what occurred. If there is a publicly available record (e.g. a forum post) please include a link." %}</li>
4545
<li>{% translate "Any extra context you believe existed for the incident." %}</li>
4646
<li>{% translate "If you believe this incident is ongoing." %}</li>
4747
<li>{% translate "Any other information you believe we should have." %}</li>
@@ -80,8 +80,8 @@ <h3>{% translate "What happens after you file a report?" %}</h3>
8080
<li>{% translate "Nothing (if we determine no violation occurred)." %}</li>
8181
<li>{% translate "A private reprimand from the working group to the individual(s) involved." %}</li>
8282
<li>{% translate "A public reprimand." %}</li>
83-
<li>{% blocktranslate %}An imposed vacation (i.e. asking someone to "take a week off" from the forum or IRC).{% endblocktranslate %}</li>
84-
<li>{% translate "A permanent or temporary ban from some or all Django spaces (forum, IRC, etc.)" %}</li>
83+
<li>{% blocktranslate %}An imposed vacation (i.e. asking someone to "take a week off" from the forum).{% endblocktranslate %}</li>
84+
<li>{% translate "A permanent or temporary ban from some or all Django spaces (the forum, etc.)" %}</li>
8585
<li>{% translate "A request for a public or private apology." %}</li>
8686
</ul>
8787
</p>

0 commit comments

Comments
 (0)