Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #1727: Remove reference to IRC and django-users and django-developers mailing lists in CoC #1808

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions djangoproject/templates/conduct/enforcement.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ <h3>{% translate "How the committee will respond to reports" %}</h3>
<p>
{% blocktranslate trimmed %}
This information will be collected in writing, and whenever possible the
committee's deliberations will be recorded and retained (i.e. IRC transcripts, email
committee's deliberations will be recorded and retained (i.e. chat transcripts, email
discussions, recorded voice conversations, etc).
{% endblocktranslate %}</p>

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

<p>
{% blocktranslate trimmed %}
If the act is ongoing (such as someone engaging in harassment in #django), or involves
If the act is ongoing (such as someone engaging in harassment on the forum), or involves
a threat to anyone's safety (e.g. threats of violence), any committee 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
Expand Down Expand Up @@ -117,18 +117,18 @@ <h3>{% translate "Resolutions" %}</h3>
<li>
{% blocktranslate trimmed %}
A public reprimand. In this case, a committee member will deliver that reprimand
in the same venue that the violation occurred (i.e. in IRC for an IRC violation;
in the same venue that the violation occurred (i.e. in the forum for a forum violation;
email for an email violation, etc.). The committee may choose to publish this message
elsewhere for posterity.{% endblocktranslate %}</li>
<li>
{% blocktranslate trimmed %}
An imposed vacation (i.e. asking someone to "take a week off" from a mailing list
or IRC). A committee member will communicate this "vacation" to the individual(s).
An imposed vacation (i.e. asking someone to "take a week off" from the forum).
A committee member 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.{% endblocktranslate %}</li>
<li>
{% blocktranslate trimmed %}
A permanent or temporary ban from some or all Django spaces (mailing lists, IRC,
A permanent or temporary ban from some or all Django spaces (the forum,
etc.). The committee will maintain records of all such bans so that they may be
reviewed in the future, extended to new Django fora, or otherwise maintained.
{% endblocktranslate %}</li>
Expand All @@ -137,7 +137,7 @@ <h3>{% translate "Resolutions" %}</h3>
A request for a public or private apology. a committee member will deliver this request.
The committee may, if it chooses, attach "strings" to this request: for example,
the committee may ask a violator to apologize in order to retain his or her membership
on a mailing list.{% endblocktranslate %}</li>
on the forum.{% endblocktranslate %}</li>
</ul>
</p>

Expand Down
9 changes: 4 additions & 5 deletions djangoproject/templates/conduct/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ <h3 id="what-does-it-mean">{% blocktranslate %}What does it mean to "adopt" a Co

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

<h3 id="dsf-events">{% translate "What about events funded by the Django Software Foundation?" %} <a class="plink" href="#dsf-events">¶</a></h3>
<p>
Expand Down
2 changes: 1 addition & 1 deletion djangoproject/templates/conduct/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h1>{% translate "Django Code of Conduct" %}</h1>
<p>
{% blocktranslate trimmed %}
This code of conduct applies to all spaces managed by the Django project or
Django Software Foundation. This includes IRC, the mailing lists, the issue
Django Software Foundation. This includes the issue
tracker, DSF events, and any other forums created by the project team
which the community uses for communication. In addition, violations of this code
outside these spaces may affect a person's ability to participate within them.
Expand Down
6 changes: 3 additions & 3 deletions djangoproject/templates/conduct/reporting.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>{% translate "Django Code of Conduct - Reporting Guide" %}</h1>
<li>{% translate "Your contact info (so we can get in touch with you if we need to follow up)" %}</li>
<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>
<li>{% translate "When and where the incident occurred. Please be as specific as possible." %}</li>
<li>{% translate "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." %}</li>
<li>{% translate "Your account of what occurred. If there is a publicly available record (e.g. a forum post) please include a link." %}</li>
<li>{% translate "Any extra context you believe existed for the incident." %}</li>
<li>{% translate "If you believe this incident is ongoing." %}</li>
<li>{% translate "Any other information you believe we should have." %}</li>
Expand Down Expand Up @@ -80,8 +80,8 @@ <h3>{% translate "What happens after you file a report?" %}</h3>
<li>{% translate "Nothing (if we determine no violation occurred)." %}</li>
<li>{% translate "A private reprimand from the working group to the individual(s) involved." %}</li>
<li>{% translate "A public reprimand." %}</li>
<li>{% blocktranslate %}An imposed vacation (i.e. asking someone to "take a week off" from a mailing list or IRC).{% endblocktranslate %}</li>
<li>{% translate "A permanent or temporary ban from some or all Django spaces (mailing lists, IRC, etc.)" %}</li>
<li>{% blocktranslate %}An imposed vacation (i.e. asking someone to "take a week off" from the forum).{% endblocktranslate %}</li>
<li>{% translate "A permanent or temporary ban from some or all Django spaces (the forum, etc.)" %}</li>
<li>{% translate "A request for a public or private apology." %}</li>
</ul>
</p>
Expand Down
Loading