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.

Sign up for GitHub

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 #1686 -- Remove reference to Django core team #1735

Merged
merged 2 commits into from
Nov 13, 2024
Merged

Fix #1686 -- Remove reference to Django core team #1735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abbb711
Remove references to "core team" on pages for Code of Conduct Changes…
ontowhee Nov 13, 2024
11d510e
Simplify sentence
ontowhee Nov 13, 2024
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
9 changes: 3 additions & 6 deletions djangoproject/templates/conduct/changes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@ <h2>Change control process</h2>
proposed via a pull request to the
<a href="https://github.com/django/djangoproject.com">djangoproject.com repository
on GitHub</a>. Changes will be reviewed by the conduct committee first, and then
sent to the DSF, the Django core team, and the Django community for comment.
We'll hold a comment period of at least one week, and then each group will vote
on the change using its normal process (a board for the DSF,
<a href="{% url 'document-detail' lang='en' version='dev' url='internals/contributing/bugs-and-features' host 'docs' %}#how-we-make-decisions">
a core dev vote</a> for the core team).
Approved changes will be merged, published, and noted below.</p>
sent to the DSF and the Django community for comment.
We'll hold a comment period of at least one week, then the DSF board will vote on
the change. Approved changes will be merged, published, and noted below.</p>

<p>This only applies to material changes; changes that don't effect the intent
(typo fixes, re-wordings, etc.) can be made immediately.</p>
Expand Down
9 changes: 3 additions & 6 deletions djangoproject/templates/diversity/changes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ <h2>Change control process</h2>
to the
<a href="https://github.com/django/djangoproject.com">djangoproject.com repository
on GitHub</a>. Changes will be reviewed by the membership first, and then
sent to the DSF, the Django core team, and the Django community for comment.
We'll hold a comment period of at least one week, and then each group will vote
on the change using its normal process (a board for the DSF,
<a href="{% url 'document-detail' lang='en' version='dev' url='internals/contributing/bugs-and-features' host 'docs' %}#how-we-make-decisions">
a core dev vote</a> for the core team).
Approved changes will be merged, published, and noted below.</p>
sent to the DSF and the Django community for comment.
We'll hold a comment period of at least one week, then the DSF board will vote on
the change. Approved changes will be merged, published, and noted below.</p>

<p>This only applies to material changes; changes that don't effect the intent
(typo fixes, re-wordings, etc.) can be made immediately.</p>
Expand Down