📝 update Code of Conduct materials to match current policies

5 files changed, 452 insertions, 289 deletions

diff --git a/djangoproject/templates/conduct/base.html b/djangoproject/templates/conduct/base.html
index 19f980eb..8ad78574 100644
--- a/djangoproject/templates/conduct/base.html
+++ b/djangoproject/templates/conduct/base.html
@@ -14,7 +14,7 @@
       <li><a href="{% url 'members:teams' %}#code-of-conduct-team">{% translate "Code of Conduct working group" %}</a></li>
       <li><a href="{% url 'conduct_faq' %}">{% translate "Frequently Asked Questions" %}</a></li>
       <li><a href="{% url 'conduct_reporting' %}">{% translate "Reporting Guide" %}</a></li>
-      <li><a href="{% url 'conduct_enforcement' %}">{% translate "Enforcement Manual" %}</a></li>
+      <li><a href="https://github.com/django/code-of-conduct/blob/main/working-group-manual.md">{% translate "Enforcement Manual" %}</a></li>
       <li><a href="{% url 'conduct_changes' %}">{% translate "Changes" %}</a></li>
     </ul>
 
@@ -22,15 +22,24 @@
     <p>
       {% blocktranslate trimmed %}
         All content on this page is licensed under a
-        <a href="https://creativecommons.org/licenses/by/3.0/">Creative Commons
-          Attribution </a> license.
+        <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons
+          Attribution-ShareAlike </a> license.
       {% endblocktranslate %}
     </p>
     <p>
-      <a href="https://creativecommons.org/licenses/by/3.0/">
-        <img src="https://i.creativecommons.org/l/by/3.0/88x31.png" height="31" width="88" alt="CC-by">
+      <a href="https://creativecommons.org/licenses/by-sa/4.0/">
+        <img src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" height="31" width="88" alt="CC-by-sa">
       </a>
     </p>
+
+    <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>.
+      {% endblocktranslate %}
+    </p>
   </div>
 {% endblock %}
 
diff --git a/djangoproject/templates/conduct/changes.html b/djangoproject/templates/conduct/changes.html
index 024870aa..1f27dbe4 100644
--- a/djangoproject/templates/conduct/changes.html
+++ b/djangoproject/templates/conduct/changes.html
@@ -16,11 +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/djangoproject.com">djangoproject.com repository
-        on GitHub</a>. Changes will be reviewed by the 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 week, then the DSF board will vote on
-      the change. Approved changes will be merged, published, and noted below.{% endblocktranslate %}</p>
+      <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 
+      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>
 
   <p>
     {% blocktranslate trimmed %}
@@ -30,33 +33,7 @@
   <p>
     {% blocktranslate trimmed %}
       A complete list of changes can always be found
-      <a href="https://github.com/django/djangoproject.com/commits/main/templates/conduct">on GitHub</a>;
-      major changes and releases are summarized below.{% endblocktranslate %}</p>
-
-  <h2>{% translate "Changelog" %}</h2>
-
-  <dl>
-    <dt>{% isodate "2014-10-03" %}</dt>
-    <dd>
-      {% blocktranslate trimmed %}
-        <a href="https://github.com/django/djangoproject.com/commit/577a02bbe968de79f8e111d6139f0c1299e994e9">
-          Revised text</a> to clarify that behavior outside the community is a contributing factor to involvement in the
-        Django community; and explicitly provided a non-exhaustive list of diversity groups we consider included under the policy.
-      {% endblocktranslate %}</dd>
-
-    <dt>{% isodate "2013-07-31" %}</dt>
-    <dd>{% translate "Documents approved and officially published." %}</dd>
-
-    <dt>{% isodate "2013-07-15" %}</dt>
-    <dd><a href="https://github.com/django/djangoproject.com/commit/ae21fb5cb1f7edfca5b5556d92fb86186d92aeb3">
-      {% blocktranslate trimmed %}
-        Added the reporting guide and enforcement manual</a>. Final draft presented
-        to the board and core membership for vote.{% endblocktranslate %}</dd>
-
-      <dt>{% isodate "2013-04-01" %}</dt>
-      <dd><a href="https://github.com/django/djangoproject.com/commit/1a0aae11a331bfbf36d6f4091d77413b780454e5">
-        {% blocktranslate trimmed %}Initial "beta" release and public call for comments{% endblocktranslate %}</a>.</dd>
-
-    </dl>
+      <a href="https://github.com/django/code-of-conduct/blob/main/CHANGELOG.md">on
+      GitHub</a>.{% endblocktranslate %}</p>
 
 {% endblock %}
diff --git a/djangoproject/templates/conduct/enforcement.html b/djangoproject/templates/conduct/enforcement.html
index 5605d928..6db9cc17 100644
--- a/djangoproject/templates/conduct/enforcement.html
+++ b/djangoproject/templates/conduct/enforcement.html
@@ -11,185 +11,7 @@
 
   <h2 class="deck">
     {% blocktranslate trimmed %}
-      This is the enforcement manual followed by Django's Code of
-      Conduct working group. It's used when we respond to an issue to make sure we're
-      consistent and fair. It should be considered an internal document, but we're
-      publishing it publicly in the interests of transparency.
-    {% endblocktranslate %}</h2>
-
-  <h3>{% translate "The Code of Conduct Working Group" %}</h3>
-
-  <p>
-    {% url 'members:teams' as teams_url %}
-    {% blocktranslate trimmed %}
-      All responses to reports of conduct violations will be managed by the
-      <a href="{{ teams_url }}#code-of-conduct-team">Code of Conduct working group</a>.
-    {% endblocktranslate %}</p>
-
-  <p>
-    {% blocktranslate trimmed %}
-      The Django Software Foundation's Board of Directors ("the board") will establish
-      this working group, comprised of at least three members. One member will be
-      designated chair of the working group and will be responsible for all reports back to
-      the board. The board will review membership on a regular basis.
-    {% endblocktranslate %}</p>
-
-  <h3>{% translate "How the working group will respond to reports" %}</h3>
-
-  <p>
-    {% blocktranslate trimmed %}
-      When a report is sent to the working group they will immediately reply to the
-      report to confirm receipt. This reply must be sent within 24 hours, and the
-      working group should strive to respond much quicker than that.
-    {% endblocktranslate %}</p>
-
-  {% url 'conduct_reporting' as conduct_reporting %}
-  <p>
-    {% blocktranslate trimmed %}
-      See the <a href="{{ conduct_reporting }}">reporting guidelines</a> for details of
-      what reports should contain. If a report doesn't contain enough information, the
-      working group will obtain all relevant data before acting. The working group is
-      empowered to act on the DSF's behalf in contacting any individuals involved to
-      get a more complete account of events.
-    {% endblocktranslate %}</p>
-
-  <p>{% translate "The working group will then review the incident and determine, to the best of their ability:" %}
-    <ul>
-      <li>{% translate "what happened" %}</li>
-      <li>{% translate "whether this event constitutes a code of conduct violation" %}</li>
-      <li>{% translate "who, if anyone, was the bad actor" %}</li>
-      <li>{% translate "whether this is an ongoing situation, and there is a threat to anyone's physical safety" %}</li>
-    </ul>
-  </p>
-
-  <p>
-    {% blocktranslate trimmed %}
-      This information will be collected in writing, and whenever possible the
-      working group's deliberations will be recorded and retained (i.e. chat transcripts, email
-      discussions, recorded voice conversations, etc).
-    {% endblocktranslate %}</p>
-
-  <p>
-    {% blocktranslate trimmed %}
-      The working group should aim to have a resolution agreed upon within one week.
-      In the event that a resolution can't be determined in that time, the working group will
-      respond to the reporter(s) with an update and projected timeline for resolution.
-    {% endblocktranslate %}</p>
-
-  <h3>{% translate "Acting Unilaterally" %}</h3>
-
-  <p>
-    {% blocktranslate trimmed %}
-      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 working group 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
-      to the working group, including bans and blocks.
-    {% endblocktranslate %}</p>
-
-  <p>
-    {% blocktranslate trimmed %}
-      If the incident involves physical danger, any member of the working group may --
-      and should -- act unilaterally to protect safety. This can include contacting
-      law enforcement (or other local personnel) and speaking on behalf of the DSF.
-    {% endblocktranslate %}</p>
-
-  <p>
-    {% blocktranslate trimmed %}
-      In situations where an individual working group member acts unilaterally, they must
-      report their actions to the working group for review within 24 hours.{% endblocktranslate %}</p>
-
-  <h3>{% translate "Resolutions" %}</h3>
-
-  <p>
-    {% blocktranslate trimmed %}
-      The working group must agree on a resolution by consensus. If the working group cannot
-      reach consensus and deadlocks for over a week, the working group will turn the matter
-      over to the board for resolution.{% endblocktranslate %}</p>
-
-  <p>{% translate "Possible responses may include:" %}
-    <ul>
-      <li>{% translate "Taking no further action (if we determine no violation occurred)." %}</li>
-      <li>
-        {% blocktranslate trimmed %}
-          A private reprimand from the working group to the individual(s) involved.
-          In this case, a working group member will deliver that reprimand to the individual(s)
-          over email, cc'ing the working group.{% endblocktranslate %}</li>
-      <li>
-        {% blocktranslate trimmed %}
-          A public reprimand. In this case, a working group member will deliver that reprimand
-          in the same venue that the violation occurred (i.e. in the forum for a forum violation;
-          email for an email violation, etc.). The working group 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 the forum).
-          A working group 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 (the forum,
-          etc.). The working group 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>
-      <li>
-        {% blocktranslate trimmed %}
-          A request for a public or private apology. a working group member will deliver this request.
-          The working group may, if it chooses, attach "strings" to this request: for example,
-          the working group may ask a violator to apologize in order to retain his or her membership
-          on the forum.{% endblocktranslate %}</li>
-    </ul>
-  </p>
-
-  <p>
-    {% blocktranslate trimmed %}
-      Once a resolution is agreed upon, but before it is enacted, the working group
-      will contact the original reporter and any other affected parties and explain
-      the proposed resolution. The working group will ask if this resolution is
-      acceptable, and must note feedback for the record. However, the working group is
-      not required to act on this feedback.
-    {% endblocktranslate %}</p>
-
-  <p>
-    {% blocktranslate trimmed %}
-      Finally the working group will make a report for the DSF board. In case the
-      incident or report involves a current member of the board, the working group will
-      provide the report only to the other board members.
-    {% endblocktranslate %}</p>
-
-  <p>
-    {% blocktranslate trimmed %}
-      The working group will never publicly discuss the issue; all public statements
-      will be made by the DSF board.
-    {% endblocktranslate %}</p>
-
-  <h3>{% translate "Conflicts of Interest" %}</h3>
-  {% url 'conduct_reporting' as url%}
-  <p>
-    {% blocktranslate trimmed %}
-      In the event of any conflict of interest a working group member must immediately
-      notify the other members, and recuse themselves if necessary. If a report concerns
-      a possible violation by a current working group member, this member should be
-      excluded from the response process. For these cases, anyone can make a report
-      directly to any of the working group chairs, as documented in the
-      <a href="{{ url }}">reporting guidelines</a>.
-    {% endblocktranslate %}</p>
-
-  <hr>
-
-  <p><i>
-    {% blocktranslate trimmed %}
-      Editor's note: Writing this document posed a unique challenge. Most
-      similar guides are written on the assumption of an in-person event. However, the
-      Django community doesn't exist in one place, and most of the time we're spread
-      out across the world and interact online. This makes trying to define and
-      enforce community standards a different type of challenge. This document is
-      adapted from the <a href="http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports">Ada Initiative template</a> and the <a href="https://us.pycon.org/2013/about/code-of-conduct/harassment-incidents/">PyCon 2013 Procedure for
-        Handling Harassment Incidents</a>, but changed to reflect the nature of our
-      community. It is our expectation that this will be a living document and change
-      as we grow to understand how to meet this challenge and best serve our community
-      and ideals.{% endblocktranslate %}</i>
-  </p>
-
+      This manual has moved to <a href="https://github.com/django/code-of-conduct/blob/main/working-group-manual.md">
+        GitHub</a>. Please see the latest version there.{% endblocktranslate %}
+  </h2>
 {% endblock %}
diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html
index 71cd1803..84d0a30c 100644
--- a/djangoproject/templates/conduct/faq.html
+++ b/djangoproject/templates/conduct/faq.html
@@ -104,6 +104,72 @@
       For more details please see our
       <a href="{{ reporting_url }}">Reporting Guidelines</a>{% endblocktranslate %}</p>
 
+  <h3 id="who-enforces">{% translate "Who enforces the Code of Conduct?" %} <a class="plink" href="#who-enforces">¶</a></h3>
+
+  <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
+      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>.
+    {% 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
+      of Conduct Working Group becomes involved for formal reports, cross-community
+      violations, or issues escalated by the online moderators.
+    {% endblocktranslate %}
+  </p>
+
+  <p>
+    {% blocktranslate trimmed %}
+      Contributor Covenant refers to "Community Moderators" as a general term for
+      whoever enforces a code of conduct. In Django, that role is filled by these two
+      working groups, each with distinct but complementary responsibilities.
+    {% endblocktranslate %}
+  </p>
+
+  <h3 id="repairing-harm">{% translate 'What does "repairing harm" mean?' %} <a class="plink" href="#repairing-harm">¶</a></h3>
+
+  <p>
+    {% blocktranslate trimmed %}
+      Repairing harm is a restorative justice approach that focuses on addressing the
+      impact of a violation rather than simply punishing the person who caused it. When
+      someone violates the Code of Conduct, our goal isn't just to apply consequences,
+      it's to help make things right for those affected and prevent similar harm in the
+      future.
+    {% endblocktranslate %}
+  </p>
+
+  <p>
+    {% blocktranslate trimmed %}
+      Repairing harm might include:
+    {% endblocktranslate %}
+  </p>
+
+  <ul>
+    <li>{% translate "Acknowledging what happened and taking responsibility for your actions" %}</li>
+    <li>{% translate "Providing a sincere apology to those affected" %}</li>
+    <li>{% translate "Reflecting on how your behavior impacted others, even if harm wasn't intended" %}</li>
+    <li>{% translate "Demonstrating understanding of what behavior changes are needed" %}</li>
+    <li>{% translate "Following through on commitments to change behavior" %}</li>
+  </ul>
+
+  <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 
+      resort.
+    {% endblocktranslate %}
+  </p>
+
   <h3 id="why-do-we-need">{% translate "Why do we need a Code of Conduct? Everyone knows not to be a jerk." %} <a class="plink" href="#why-do-we-need">¶</a></h3>
 
   <p>{% translate "Sadly, not everyone knows this." %}</p>
@@ -119,6 +185,50 @@
       important.
     {% endblocktranslate %}</p>
 
+  <h3 id="responding-to-report">{% translate "What should I do if I've been accused of violating the Code of Conduct?" %} <a class="plink" href="#responding-to-report">¶</a></h3>
+
+  <p>
+    {% blocktranslate trimmed %}
+      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>
+
+  <ul>
+    <li>{% translate "Stay calm and professional. Do not respond with sarcasm, attack the Code of Conduct itself, or criticize the person who reported the concern." %}</li>
+    <li>{% translate "Focus on the facts. Clearly describe what happened from your perspective, sticking to objective details rather than interpretations or assumptions." %}</li>
+    <li>{% translate "Listen and reflect. Work to understand any harm you may have caused, even if that wasn't your intention. Impact matters more than intent." %}</li>
+    <li>{% translate "Consider how to repair harm. Think about what you can do to make things right and prevent similar issues in the future." %}</li>
+    <li>{% translate "Cooperate with the process. Work with the working group as they evaluate the report. If you disagree with their decision, you may ask about the appeal process." %}</li>
+  </ul>
+
+  <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, 
+      collaborative community of kind, compassionate people of all kinds.
+    {% endblocktranslate %}
+  </p>
+
+  <h3 id="outside-behavior">{% translate "Can someone be removed for behavior outside Django spaces?" %} <a class="plink" href="#outside-behavior">¶</a></h3>
+
+  <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 
+      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 
+      safety and well-being of Django community members.
+    {% endblocktranslate %}
+  </p>
+
   <h3 id="free-speech">{% blocktranslate %}This is censorship! I have the right to say whatever I want!{% endblocktranslate %} <a class="plink" href="#free-speech">¶</a></h3>
 
   <p>
diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html
index b4852a3c..2b6eb063 100644
--- a/djangoproject/templates/conduct/reporting.html
+++ b/djangoproject/templates/conduct/reporting.html
@@ -26,115 +26,360 @@
       appropriate, please include this in your report and we will attempt to notify
       them.{% endblocktranslate %}</p>
 
+  <h2 id="when-to-report">{% translate "Understanding When to Report" %} <a class="plink" href="#when-to-report">#</a></h2>
+
+  <p>
+    {% blocktranslate trimmed %}
+      Not every conflict or disagreement represents a Code of Conduct violation.
+      Tensions can occur between community members even when they are trying their best
+      to collaborate in good faith. Differences of opinion, technical disagreements, and
+      communication challenges are normal parts of working together. However, violations
+      often occur in how we respond to these disagreements. It's acceptable to question
+      the merit of a technical decision, but it's not acceptable to question the merit
+      or value of the people who made that decision.
+    {% endblocktranslate %}
+  </p>
+
+  <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 
+      to improve the Code of Conduct or the processes surrounding it.
+    {% 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 
+      encourage you to report it, even if you were not the target of the behavior.
+    {% endblocktranslate %}
+  </p>
+
+  <h2 id="language-accessibility">{% translate "Language Accessibility" %} <a class="plink" href="#language-accessibility">#</a></h2>
+
+  <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 
+      will make every effort to work with reports submitted in any language.
+    {% endblocktranslate %}
+  </p>
+
+  <h2 id="what-to-include">{% translate "What to Include in Your Report" %} <a class="plink" href="#what-to-include">#</a></h2>
+
+  <p>
+    {% blocktranslate trimmed %}
+      In your report please include:
+    {% endblocktranslate %}
+  </p>
+
+  <ul>
+    <li>{% translate "Your contact information (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 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>
+  </ul>
+
+  <h2 id="confidentiality-privacy">{% translate "Confidentiality and Privacy" %} <a class="plink" href="#confidentiality-privacy">#</a></h2>
+
+  <p>
+    {% blocktranslate trimmed %}
+      The working group is committed to protecting your privacy and the privacy of all
+      individuals involved in Code of Conduct matters.
+    {% endblocktranslate %}
+  </p>
+
+  <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 
+      made a report.
+    {% endblocktranslate %}
+  </p>
+
+  <p>
+    {% blocktranslate trimmed %}
+      Personal information is:
+    {% endblocktranslate %}
+  </p>
+
+  <ul>
+    <li>{% translate "Stored securely with access limited to working group members handling the specific report" %}</li>
+    <li>{% translate "Used only for the purpose of investigating and resolving reports" %}</li>
+    <li>{% translate "Retained in accordance with the Django Software Foundation's data retention policies and applicable privacy laws" %}</li>
+    <li>{% translate "Protected in accordance with applicable data protection regulations" %}</li>
+  </ul>
+
+  <p>
+    {% blocktranslate trimmed %}
+      For details on how records are maintained, see the <a href="#record-keeping">Record 
+      Keeping section</a> below.
+    {% endblocktranslate %}
+  </p>
+
+  <h2 id="protection-from-retaliation">{% translate "Protection from Retaliation" %} <a class="plink" href="#protection-from-retaliation">#</a></h2>
+
+  <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 
+      experience retaliation after making a report, please report that as well.
+    {% endblocktranslate %}
+  </p>
+
+  <h2 id="after-filing">{% translate "What Happens After You File a Report?" %} <a class="plink" href="#after-filing">#</a></h2>
+
+  <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 
+      informed of progress and any delays.
+    {% endblocktranslate %}
+  </p>
+
+  <p>
+    {% blocktranslate trimmed %}
+      The working group will immediately meet to review the incident and determine:
+    {% endblocktranslate %}
+  </p>
+
+  <ul>
+    <li>{% translate "What happened." %}</li>
+    <li>{% translate "Whether this event constitutes a Code of Conduct violation." %}</li>
+    <li>{% translate "Who was responsible for the behavior." %}</li>
+    <li>{% translate "Whether this is an ongoing situation, or if there is a threat to anyone's physical safety." %}</li>
+  </ul>
+
+  <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 
+      ended and that everyone is physically safe.
+    {% endblocktranslate %}
+  </p>
+
+  <h3 id="ongoing-incidents">{% translate "Ongoing Incidents and Immediate Action" %} <a class="plink" href="#ongoing-incidents">#</a></h3>
+
+  <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 
+      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.
+    {% endblocktranslate %}
+  </p>
+
+  <h3 id="investigation-resolution">{% translate "Investigation and Resolution" %} <a class="plink" href="#investigation-resolution">#</a></h3>
+
   <p>
     {% blocktranslate trimmed %}
-      If you are unsure whether the 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 %}</p>
+      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 matter over to the board for resolution.
+    {% endblocktranslate %}
+  </p>
 
-  <p>{% translate "In your report please include:" %}
-    <ul>
-      <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 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>
-    </ul>
+  <p>
+    {% blocktranslate trimmed %}
+      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, 
+      lower levels may be skipped.
+    {% endblocktranslate %}
   </p>
 
-  <h3>{% translate "What happens after you file a report?" %}</h3>
+  <h3 id="resolution-input">{% translate "Your Input on the Resolution" %} <a class="plink" href="#resolution-input">#</a></h3>
 
   <p>
     {% blocktranslate trimmed %}
-      You will receive an email from the DSF Code of Conduct Working Group
-      acknowledging receipt immediately. We promise to acknowledge receipt within 24
-      hours (and will aim for much quicker than that).{% endblocktranslate %}</p>
+      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 
+      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.
+    {% endblocktranslate %}
+  </p>
 
-  <p>{% translate "The working group will immediately meet to review the incident and determine:" %}
-    <ul>
-      <li>{% translate "What happened." %}</li>
-      <li>{% translate "Whether this event constitutes a code of conduct violation." %}</li>
-      <li>{% translate "Who the bad actor was." %}</li>
-      <li>{% translate "Whether this is an ongoing situation, or if there is a threat to anyone's physical safety." %}</li>
-    </ul>
+  <p>
+    {% blocktranslate trimmed %}
+      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 %}
-      If this is determined to be an ongoing incident or a threat to physical safety,
-      the working groups' 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>
+      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>
+
+  <h2 id="reporting-member">{% translate "If Your Report Concerns a Code of Conduct Working Group Member" %} <a class="plink" href="#reporting-member">#</a></h2>
+
+  <h3 id="conflicts-of-interest">{% translate "Conflicts of Interest" %} <a class="plink" href="#conflicts-of-interest">#</a></h3>
+
+  <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 
+      handling a report if they:
+    {% endblocktrans %}
+  </p>
+
+  <ul>
+    <li>{% translate "Are involved in the incident itself" %}</li>
+    <li>{% translate "Have a personal relationship with any involved party" %}</li>
+    <li>{% translate "Work for the same employer as an involved party" %}</li>
+    <li>{% translate "Have access to private information that could bias their judgment" %}</li>
+    <li>{% translate "Have any other conflict of interest that could affect their impartiality" %}</li>
+  </ul>
 
   <p>
     {% blocktranslate trimmed %}
-      Once the working group has a complete account of the events they will make a
-      decision as to how to response. Responses may include:{% endblocktranslate %}
-    <ul>
-      <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 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>
+      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 %}
-      We'll respond within one week to the person who filed the report with either a
-      resolution or an explanation of why the situation is not yet resolved.{% endblocktranslate %}</p>
+      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 %}
-      Once we've determined our final action, we'll contact the original reporter to
-      let them know what action (if any) we'll be taking. We'll take into account
-      feedback from the reporter on the appropriateness of our response, but we don't
-      guarantee we'll act on it.{% endblocktranslate %}</p>
+      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>
+
+  <h2 id="reconsideration">{% translate "Reconsideration" %} <a class="plink" href="#reconsideration">#</a></h2>
 
   <p>
     {% blocktranslate trimmed %}
-      Finally, the Working Group will make a report on the situation to the DSF board.
-      The board may choose to a public report of the incident.{% endblocktranslate %}</p>
+      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>
+
+  <h2 id="transparency">{% translate "Transparency and Public Accountability" %} <a class="plink" href="#transparency">#</a></h2>
 
-  <h3>{% translate "What if your report concerns a possible violation by a working group member?" %}</h3>
+  <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, 
+      if deemed necessary.
+    {% endblocktranslate %}
+  </p>
 
   <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 members will
-      see the report.{% endblocktranslate %}</p>
+      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>
+
+  <ul>
+    <li>{% translate "Number of reports received" %}</li>
+    <li>{% translate "Types of violations reported" %}</li>
+    <li>{% translate "General outcomes (warnings, suspensions, bans)" %}</li>
+    <li>{% translate "Any trends or patterns observed" %}</li>
+  </ul>
 
   <p>
-    {% url 'members:teams' as teams_url %}
     {% blocktranslate trimmed %}
-      In that case, you can make a report directly to any or all of the current
-      (vice/co) chairs of the Code of Conduct working group. Their e-mail addresses are
-      listed on the <a href="{{ teams_url }}#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>
+      These reports will be prepared in a way that protects the confidentiality of all 
+      involved parties while providing community accountability.
+    {% endblocktranslate %}
+  </p>
+
+  <h2 id="record-keeping">{% translate "Record Keeping" %} <a class="plink" href="#record-keeping">#</a></h2>
+
+  <h3 id="record-retention">{% translate "Record Retention" %} <a class="plink" href="#record-retention">#</a></h3>
 
   <p>
     {% blocktranslate trimmed %}
-      If your report concerns all current (vice/co) 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>
+      The working group maintains records of all information and communications related 
+      to incident reports, including:
+    {% endblocktranslate %}
+  </p>
 
-  <h3>{% translate "Reconsideration" %}</h3>
+  <ul>
+    <li>{% translate "Initial reports and all communications with reporters" %}</li>
+    <li>{% translate "Investigation materials and evidence" %}</li>
+    <li>{% translate "Email discussions and documented deliberations" %}</li>
+    <li>{% translate "Notes and key takeaways from meetings" %}</li>
+    <li>{% translate "Decisions made in DSF Slack (recorded into meeting notes)" %}</li>
+    <li>{% translate "Communications with all involved parties" %}</li>
+    <li>{% translate "Final resolutions and any follow-up actions" %}</li>
+  </ul>
 
   <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>
-      with your request and motivation and the DSF board will review the case.{% endblocktranslate %}</p>
+      Records are retained in accordance with the Django Software Foundation's data 
+      retention policies and applicable privacy laws.
+    {% endblocktranslate %}
+  </p>
+
+  <h3 id="record-access">{% translate "Access to Records" %} <a class="plink" href="#record-access">#</a></h3>
 
+  <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 
+      decision-making. The board may request access to records for oversight purposes.
+    {% endblocktranslate %}
+  </p>
 {% endblock %}