📝 update Code of Conduct materials to match current policies (fix DJhtml formatting)

4 files changed, 94 insertions, 94 deletions

diff --git a/djangoproject/templates/conduct/base.html b/djangoproject/templates/conduct/base.html
index 8ad78574..12ece55b 100644
--- a/djangoproject/templates/conduct/base.html
+++ b/djangoproject/templates/conduct/base.html
@@ -35,9 +35,9 @@
     <h3>{% translate "Sources" %}</h3>
     <p>
       {% blocktranslate trimmed %}
-        Our documents and policies are adapted from and inspired by 
-        <a href="https://github.com/django/code-of-conduct/blob/main/sources.md">a 
-        number of sources</a>.
+        Our documents and policies are adapted from and inspired by
+        <a href="https://github.com/django/code-of-conduct/blob/main/sources.md">a
+          number of sources</a>.
       {% endblocktranslate %}
     </p>
   </div>
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 %}
diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html
index 84d0a30c..940b541f 100644
--- a/djangoproject/templates/conduct/faq.html
+++ b/djangoproject/templates/conduct/faq.html
@@ -109,18 +109,18 @@
   <p>
     {% blocktranslate trimmed %}
       The <a href="{% url 'members:teams' %}#code-of-conduct-team">Code of Conduct
-      Working Group</a> is responsible for investigating reports and enforcing the Code
+        Working Group</a> is responsible for investigating reports and enforcing the Code
       of Conduct. The working group is appointed by the Django Software Foundation
       board and operates according to the procedures documented in the <a href="https://github.com/django/code-of-conduct/blob/main/working-group-manual.md">
-      Working Group Manual</a>.
+        Working Group Manual</a>.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      For day-to-day moderation in Django's online spaces (like the forum and Discord), 
-      the <a href="{% url 'members:teams' %}#online-community-team">Online Community 
-      Working Group</a> handles issues using their own moderation processes. The Code
+      For day-to-day moderation in Django's online spaces (like the forum and Discord),
+      the <a href="{% url 'members:teams' %}#online-community-team">Online Community
+        Working Group</a> handles issues using their own moderation processes. The Code
       of Conduct Working Group becomes involved for formal reports, cross-community
       violations, or issues escalated by the online moderators.
     {% endblocktranslate %}
@@ -162,10 +162,10 @@
 
   <p>
     {% blocktranslate trimmed %}
-      This approach recognizes that people can learn from mistakes and that communities 
-      are stronger when we focus on growth, accountability, and making amends rather 
-      than purely punitive measures. Of course, some violations are severe enough that 
-      removal from the community is necessary to protect others, but that's a last 
+      This approach recognizes that people can learn from mistakes and that communities
+      are stronger when we focus on growth, accountability, and making amends rather
+      than purely punitive measures. Of course, some violations are severe enough that
+      removal from the community is necessary to protect others, but that's a last
       resort.
     {% endblocktranslate %}
   </p>
@@ -189,7 +189,7 @@
 
   <p>
     {% blocktranslate trimmed %}
-      If you are contacted by the Code of Conduct Working Group about a possible 
+      If you are contacted by the Code of Conduct Working Group about a possible
       violation, it's important to respond professionally and constructively:
     {% endblocktranslate %}
   </p>
@@ -204,8 +204,8 @@
 
   <p>
     {% blocktranslate trimmed %}
-      The working group's goal is to respond proportionally to violations and work with 
-      everyone involved to prevent future issues. We want to maintain a safe, 
+      The working group's goal is to respond proportionally to violations and work with
+      everyone involved to prevent future issues. We want to maintain a safe,
       collaborative community of kind, compassionate people of all kinds.
     {% endblocktranslate %}
   </p>
@@ -215,16 +215,16 @@
   <p>
     {% blocktranslate trimmed %}
       The Code of Conduct applies to all Django-managed spaces and when someone is
-      officially representing Django. However, as stated in the Code of Conduct, 
-      violations of this code outside these spaces may affect a person's ability to 
+      officially representing Django. However, as stated in the Code of Conduct,
+      violations of this code outside these spaces may affect a person's ability to
       participate within them.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      This means that while we don't police behavior everywhere on the internet, the 
-      working group may consider serious external conduct when it directly impacts the 
+      This means that while we don't police behavior everywhere on the internet, the
+      working group may consider serious external conduct when it directly impacts the
       safety and well-being of Django community members.
     {% endblocktranslate %}
   </p>
diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html
index 2b6eb063..7cee327b 100644
--- a/djangoproject/templates/conduct/reporting.html
+++ b/djangoproject/templates/conduct/reporting.html
@@ -42,22 +42,22 @@
 
   <p>
     {% blocktranslate trimmed %}
-      If you are unsure whether an incident is a violation, or whether the space where 
-      it happened is covered by this Code of Conduct, we encourage you to still report 
-      it. We would much rather have a few extra reports where we decide to take no 
-      action, rather than miss a report of an actual violation. We do not look 
-      negatively on you if we find the incident is not a violation. And knowing about 
-      incidents that are not violations, or happen outside our spaces, can also help us 
+      If you are unsure whether an incident is a violation, or whether the space where
+      it happened is covered by this Code of Conduct, we encourage you to still report
+      it. We would much rather have a few extra reports where we decide to take no
+      action, rather than miss a report of an actual violation. We do not look
+      negatively on you if we find the incident is not a violation. And knowing about
+      incidents that are not violations, or happen outside our spaces, can also help us
       to improve the Code of Conduct or the processes surrounding it.
-    {% endblocktranslate %}  
+    {% endblocktranslate %}
   </p>
 
   <h2 id="who-can-report">{% translate "Who Can Report" %} <a class="plink" href="#who-can-report">#</a></h2>
 
   <p>
     {% blocktranslate trimmed %}
-      You do not need to be directly affected by an incident to report it. If you 
-      witness or become aware of behavior that violates the Code of Conduct, we 
+      You do not need to be directly affected by an incident to report it. If you
+      witness or become aware of behavior that violates the Code of Conduct, we
       encourage you to report it, even if you were not the target of the behavior.
     {% endblocktranslate %}
   </p>
@@ -66,9 +66,9 @@
 
   <p>
     {% blocktranslate trimmed %}
-      While reports can be submitted in any language, please note that the working 
-      group primarily operates in English. If you use translation tools to prepare your 
-      report, please let us know so we can keep that in mind during our evaluation. We 
+      While reports can be submitted in any language, please note that the working
+      group primarily operates in English. If you use translation tools to prepare your
+      report, please let us know so we can keep that in mind during our evaluation. We
       will make every effort to work with reports submitted in any language.
     {% endblocktranslate %}
   </p>
@@ -102,9 +102,9 @@
 
   <p>
     {% blocktranslate trimmed %}
-      Reports and the identity of reporters will be kept confidential to the extent 
-      possible. The working group will not share reporter identities with the reported 
-      party. However, in some situations, context may allow individuals to infer who 
+      Reports and the identity of reporters will be kept confidential to the extent
+      possible. The working group will not share reporter identities with the reported
+      party. However, in some situations, context may allow individuals to infer who
       made a report.
     {% endblocktranslate %}
   </p>
@@ -124,8 +124,8 @@
 
   <p>
     {% blocktranslate trimmed %}
-      For details on how records are maintained, see the <a href="#record-keeping">Record 
-      Keeping section</a> below.
+      For details on how records are maintained, see the <a href="#record-keeping">Record
+        Keeping section</a> below.
     {% endblocktranslate %}
   </p>
 
@@ -133,8 +133,8 @@
 
   <p>
     {% blocktranslate trimmed %}
-      Retaliation against anyone who reports a concern in good faith is itself a 
-      violation of this Code of Conduct and will be treated seriously. If you 
+      Retaliation against anyone who reports a concern in good faith is itself a
+      violation of this Code of Conduct and will be treated seriously. If you
       experience retaliation after making a report, please report that as well.
     {% endblocktranslate %}
   </p>
@@ -143,9 +143,9 @@
 
   <p>
     {% blocktranslate trimmed %}
-      You will receive an email from the DSF Code of Conduct Working Group 
-      acknowledging receipt. The working group strives to respond promptly, recognizing 
-      that as volunteers, coordination may take time. The working group will keep you 
+      You will receive an email from the DSF Code of Conduct Working Group
+      acknowledging receipt. The working group strives to respond promptly, recognizing
+      that as volunteers, coordination may take time. The working group will keep you
       informed of progress and any delays.
     {% endblocktranslate %}
   </p>
@@ -165,9 +165,9 @@
 
   <p>
     {% blocktranslate trimmed %}
-      If this is determined to be an ongoing incident or a threat to physical safety, 
-      the working group's immediate priority will be to protect everyone involved. This 
-      means we may delay an "official" response until we believe that the situation has 
+      If this is determined to be an ongoing incident or a threat to physical safety,
+      the working group's immediate priority will be to protect everyone involved. This
+      means we may delay an "official" response until we believe that the situation has
       ended and that everyone is physically safe.
     {% endblocktranslate %}
   </p>
@@ -176,19 +176,19 @@
 
   <p>
     {% blocktranslate trimmed %}
-      Examples of ongoing incidents include: someone continuing to engage in harassment 
-      on a forum, persistent unwelcome contact, or any situation where harmful behavior 
+      Examples of ongoing incidents include: someone continuing to engage in harassment
+      on a forum, persistent unwelcome contact, or any situation where harmful behavior
       is actively continuing.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      For ongoing situations or threats to safety, working group members may act 
-      immediately (before reaching consensus) to protect community members. This can 
-      include temporarily restricting someone's access to certain spaces or requiring 
-      they avoid contact with specific individuals. See our <a href="https://github.com/django/code-of-conduct/blob/main/working-group-manual.md#acting-unilaterally">Working 
-      Group Manual</a> for more details on how we handle urgent situations.
+      For ongoing situations or threats to safety, working group members may act
+      immediately (before reaching consensus) to protect community members. This can
+      include temporarily restricting someone's access to certain spaces or requiring
+      they avoid contact with specific individuals. See our <a href="https://github.com/django/code-of-conduct/blob/main/working-group-manual.md#acting-unilaterally">Working
+        Group Manual</a> for more details on how we handle urgent situations.
     {% endblocktranslate %}
   </p>
 
@@ -196,27 +196,27 @@
 
   <p>
     {% blocktranslate trimmed %}
-      The working group aims to have an initial response to you within one week of 
-      receiving your report, though we recognize that complex cases may take longer. 
+      The working group aims to have an initial response to you within one week of
+      receiving your report, though we recognize that complex cases may take longer.
       We will keep you informed throughout the investigation process.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      The working group must agree on a resolution by consensus. If the working group 
-      cannot reach consensus within a reasonable timeframe, the working group will turn 
+      The working group must agree on a resolution by consensus. If the working group
+      cannot reach consensus within a reasonable timeframe, the working group will turn
       the matter over to the board for resolution.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      Once the working group has a complete account of the events, they will make a 
+      Once the working group has a complete account of the events, they will make a
       decision as to how to respond using our <a href="https://github.com/django/code-of-conduct/blob/main/enforcement-ladder.md">Enforcement
-      Ladder</a>. The enforcement ladder includes responses ranging from warnings to 
-      permanent bans, with the goal of repairing harm while considering the incident's 
-      impact on individuals and the community. Depending on the severity of a violation, 
+        Ladder</a>. The enforcement ladder includes responses ranging from warnings to
+      permanent bans, with the goal of repairing harm while considering the incident's
+      impact on individuals and the community. Depending on the severity of a violation,
       lower levels may be skipped.
     {% endblocktranslate %}
   </p>
@@ -225,31 +225,31 @@
 
   <p>
     {% blocktranslate trimmed %}
-      Once a resolution is agreed upon, but before it is enacted, the working group will 
-      contact you and any other affected parties to explain the proposed resolution. 
-      The working group will ask if this resolution is acceptable, and will note your 
+      Once a resolution is agreed upon, but before it is enacted, the working group will
+      contact you and any other affected parties to explain the proposed resolution.
+      The working group will ask if this resolution is acceptable, and will note your
       feedback for the record.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      However, the working group is not required to act on this feedback. The final 
+      However, the working group is not required to act on this feedback. The final
       decision rests with the working group, using their best judgment to balance the
-       needs of the affected parties with the safety and health of the broader community.
+      needs of the affected parties with the safety and health of the broader community.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      Once we've determined our final action, we'll contact you to let you know what 
+      Once we've determined our final action, we'll contact you to let you know what
       action (if any) we'll be taking.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      Finally, the Working Group will make a report on the situation to the DSF board. 
+      Finally, the Working Group will make a report on the situation to the DSF board.
       The board may choose to issue a public report of the incident.
     {% endblocktranslate %}
   </p>
@@ -260,8 +260,8 @@
 
   <p>
     {% blocktrans trimmed %}
-      Any member of the working group must immediately notify the other members in 
-      writing (by disclosure on the report email thread) and recuse themselves from 
+      Any member of the working group must immediately notify the other members in
+      writing (by disclosure on the report email thread) and recuse themselves from
       handling a report if they:
     {% endblocktrans %}
   </p>
@@ -276,28 +276,28 @@
 
   <p>
     {% blocktranslate trimmed %}
-      If your report concerns a current member of the Code of Conduct working group, 
-      you may not feel comfortable sending your report to the working group, as all 
+      If your report concerns a current member of the Code of Conduct working group,
+      you may not feel comfortable sending your report to the working group, as all
       members will see the report.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      In that case, you can make a report directly to any or all of the current chairs 
-      of the Code of Conduct working group. Their email addresses are listed on the 
-      <a href="{% url 'members:teams' %}#code-of-conduct-team">Code of Conduct working 
-      group</a> page. The chairs will follow the usual enforcement process with the 
-      other members, but will exclude the member(s) that the report concerns from any 
+      In that case, you can make a report directly to any or all of the current chairs
+      of the Code of Conduct working group. Their email addresses are listed on the
+      <a href="{% url 'members:teams' %}#code-of-conduct-team">Code of Conduct working
+        group</a> page. The chairs will follow the usual enforcement process with the
+      other members, but will exclude the member(s) that the report concerns from any
       discussion or decision making.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      If your report concerns all current chairs of the working group, please send your 
-      report directly to the DSF board at 
-      <a href="mailto:foundation@djangoproject.com">foundation@djangoproject.com</a> 
+      If your report concerns all current chairs of the working group, please send your
+      report directly to the DSF board at
+      <a href="mailto:foundation@djangoproject.com">foundation@djangoproject.com</a>
       instead.
     {% endblocktranslate %}
   </p>
@@ -306,9 +306,9 @@
 
   <p>
     {% blocktranslate trimmed %}
-      Any of the parties directly involved or affected can request reconsideration of 
-      the working group's decision. To make such a request, contact the DSF Board at 
-      <a href="mailto:foundation@djangoproject.com">foundation@djangoproject.com</a> 
+      Any of the parties directly involved or affected can request reconsideration of
+      the working group's decision. To make such a request, contact the DSF Board at
+      <a href="mailto:foundation@djangoproject.com">foundation@djangoproject.com</a>
       with your request and motivation and the DSF board will review the case.
     {% endblocktranslate %}
   </p>
@@ -317,16 +317,16 @@
 
   <p>
     {% blocktranslate trimmed %}
-      The working group will never publicly discuss specific incidents. All public 
-      statements about individual Code of Conduct matters will be made by the DSF board, 
+      The working group will never publicly discuss specific incidents. All public
+      statements about individual Code of Conduct matters will be made by the DSF board,
       if deemed necessary.
     {% endblocktranslate %}
   </p>
 
   <p>
     {% blocktranslate trimmed %}
-      However, to demonstrate that the Code of Conduct is being actively and fairly 
-      enforced, the working group will publish annual transparency reports including 
+      However, to demonstrate that the Code of Conduct is being actively and fairly
+      enforced, the working group will publish annual transparency reports including
       anonymized statistics such as:
     {% endblocktranslate %}
   </p>
@@ -340,7 +340,7 @@
 
   <p>
     {% blocktranslate trimmed %}
-      These reports will be prepared in a way that protects the confidentiality of all 
+      These reports will be prepared in a way that protects the confidentiality of all
       involved parties while providing community accountability.
     {% endblocktranslate %}
   </p>
@@ -351,7 +351,7 @@
 
   <p>
     {% blocktranslate trimmed %}
-      The working group maintains records of all information and communications related 
+      The working group maintains records of all information and communications related
       to incident reports, including:
     {% endblocktranslate %}
   </p>
@@ -368,7 +368,7 @@
 
   <p>
     {% blocktranslate trimmed %}
-      Records are retained in accordance with the Django Software Foundation's data 
+      Records are retained in accordance with the Django Software Foundation's data
       retention policies and applicable privacy laws.
     {% endblocktranslate %}
   </p>
@@ -378,7 +378,7 @@
   <p>
     {% blocktranslate trimmed %}
       All members of the working group involved in handling a specific incident report
-      have access to all records related to that report. This ensures informed 
+      have access to all records related to that report. This ensures informed
       decision-making. The board may request access to records for oversight purposes.
     {% endblocktranslate %}
   </p>