summaryrefslogtreecommitdiff
path: root/djangoproject/templates/conduct/changes.html
diff options
context:
space:
mode:
Diffstat (limited to 'djangoproject/templates/conduct/changes.html')
-rw-r--r--djangoproject/templates/conduct/changes.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/djangoproject/templates/conduct/changes.html b/djangoproject/templates/conduct/changes.html
index 1f27dbe4..e9668733 100644
--- a/djangoproject/templates/conduct/changes.html
+++ b/djangoproject/templates/conduct/changes.html
@@ -16,14 +16,14 @@
We're (mostly) programmers, so we'll track changes to the code of conduct and
associated documents the same way we track changes to code. All changes will
be proposed via a pull request to the
- <a href="https://github.com/django/code-of-conduct">Django Code of Conduct
- repository on GitHub</a>. Changes will be reviewed by the code of conduct
+ <a href="https://github.com/django/code-of-conduct">Django Code of Conduct
+ repository on GitHub</a>. Changes will be reviewed by the code of conduct
working group first, and then sent to the DSF and the Django community for
- comment. We'll hold a comment period of at least one month. Changes to the Code
+ comment. We'll hold a comment period of at least one month. Changes to the Code
of Conduct itself will be voted on by the DSF board; other documentation changes
will be approved by the code of conduct working group. Approved changes will be
merged, published, and noted in <a href="https://github.com/django/code-of-conduct/blob/main/CHANGELOG.md">
- our changelog</a>.{% endblocktranslate %}</p>
+ our changelog</a>.{% endblocktranslate %}</p>
<p>
{% blocktranslate trimmed %}
@@ -34,6 +34,6 @@
{% blocktranslate trimmed %}
A complete list of changes can always be found
<a href="https://github.com/django/code-of-conduct/blob/main/CHANGELOG.md">on
- GitHub</a>.{% endblocktranslate %}</p>
+ GitHub</a>.{% endblocktranslate %}</p>
{% endblock %}