-
-
Notifications
You must be signed in to change notification settings - Fork 978
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
fix #1727: Remove reference to IRC and django-users and django-developers mailing lists in CoC #1808
Conversation
I found a few more refences to the mailing list(s) that should be changed to refer to the forum instead (found them using
Thanks! 🎸 |
Co-authored-by: Sarah Boyce <[email protected]>
for more information, see https://pre-commit.ci
Changes from #1823 are included in this PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @ontowhee @sarahboyce! I think it’d be nice for our CoC working group to further review the choice of word, but all the changes here seem very solid to me as-is, so I believe we’re good to go with those improvements.
I had created #1895 to capture any last follow-up work but really there’s only two occurrences that I’d want to recommend changing, and the current wording is clearly better. So I’ll just follow up with CoC people over email. For ref here’s the additional changes I considered as a patch: diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html
index 71cd1803..798e8c8d 100644
--- a/djangoproject/templates/conduct/faq.html
+++ b/djangoproject/templates/conduct/faq.html
@@ -57,10 +57,10 @@
<p>
{% blocktranslate trimmed %}
- 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>
+ In practice, this means online discussion spaces (chat, forum, 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>
<h3 id="dsf-events">{% translate "What about events funded by the Django Software Foundation?" %} <a class="plink" href="#dsf-events">¶</a></h3>
<p>
diff --git a/djangoproject/templates/conduct/index.html b/djangoproject/templates/conduct/index.html
index 52ebf30f..87fd05fa 100644
--- a/djangoproject/templates/conduct/index.html
+++ b/djangoproject/templates/conduct/index.html
@@ -36,8 +36,8 @@
<p>
{% blocktranslate trimmed %}
This code of conduct applies to all spaces managed by the Django project or
- Django Software Foundation. This includes the issue
- tracker, DSF events, and any other forums created by the project team
+ Django Software Foundation. This includes chat platforms, the forum, the issue
+ tracker, DSF events, and any other space 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.
{% endblocktranslate %}</p>
-- |
Fix #1727
Text changes for the page (https://www.djangoproject.com/conduct/faq/)
Before
After