6 files changed, 14 insertions, 9 deletions
diff --git a/djangoproject/templates/conduct/base.html b/djangoproject/templates/conduct/base.html
index 12ece55b..17348bdc 100644
--- a/djangoproject/templates/conduct/base.html
+++ b/djangoproject/templates/conduct/base.html
@@ -3,7 +3,7 @@
 
 {% block header %}
   <p>{% translate "Code of Conduct" %}</p>
-{% endblock %}
+{% endblock header %}
 
 {% block content-related %}
   <div role="complementary">
@@ -41,6 +41,6 @@
       {% endblocktranslate %}
     </p>
   </div>
-{% endblock %}
+{% endblock content-related %}
 
 {% block title %}{% translate "Django Code of Conduct" %}{% endblock %}
diff --git a/djangoproject/templates/conduct/changes.html b/djangoproject/templates/conduct/changes.html
index e9668733..cd36b137 100644
--- a/djangoproject/templates/conduct/changes.html
+++ b/djangoproject/templates/conduct/changes.html
@@ -4,6 +4,7 @@
 {% block title %}{% translate "Django Code of Conduct - Changes" %}{% endblock %}
 
 {% block og_title %}{% translate "Django Code of Conduct - Changes" %}{% endblock %}
+
 {% block og_description %}{% translate "Changes to the Code of Conduct" %}{% endblock %}
 
 {% block content %}
@@ -36,4 +37,4 @@
       <a href="https://github.com/django/code-of-conduct/blob/main/CHANGELOG.md">on
         GitHub</a>.{% endblocktranslate %}</p>
 
-{% endblock %}
+{% endblock content %}
diff --git a/djangoproject/templates/conduct/enforcement.html b/djangoproject/templates/conduct/enforcement.html
index 6db9cc17..6880168e 100644
--- a/djangoproject/templates/conduct/enforcement.html
+++ b/djangoproject/templates/conduct/enforcement.html
@@ -4,6 +4,7 @@
 {% block title %}{% translate "Django Code of Conduct - Enforcement Manual" %}{% endblock %}
 
 {% block og_title %}{% translate "Django Code of Conduct - Enforcement Manual" %}{% endblock %}
+
 {% block og_description %}{% translate "This is the enforcement manual followed by Django's Code of Conduct working group" %}{% endblock %}
 
 {% block content %}
@@ -14,4 +15,4 @@
       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 %}
+{% endblock content %}
diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html
index 4133c126..f387afd8 100644
--- a/djangoproject/templates/conduct/faq.html
+++ b/djangoproject/templates/conduct/faq.html
@@ -4,6 +4,7 @@
 {% block title %}{% translate "Django Code of Conduct - FAQ" %}{% endblock %}
 
 {% block og_title %}{% translate "Django Code of Conduct - FAQ" %}{% endblock %}
+
 {% block og_description %}{% translate "Common questions and concerns around the Django community's Code of Conduct" %}{% endblock %}
 
 {% block content %}
@@ -240,7 +241,7 @@
       whatever codes of conduct you want in the spaces that belong to you. Please
       honor this Code of Conduct in our spaces.{% endblocktranslate %}</p>
 
-{% endblock %}
+{% endblock content %}
 
 {% block head_extra %}
   {{ block.super }}
diff --git a/djangoproject/templates/conduct/index.html b/djangoproject/templates/conduct/index.html
index 72c70d52..24c9b026 100644
--- a/djangoproject/templates/conduct/index.html
+++ b/djangoproject/templates/conduct/index.html
@@ -4,6 +4,7 @@
 {% block title %}{% translate "Django Code of Conduct" %}{% endblock %}
 
 {% block og_title %}{% translate "Django Code of Conduct" %}{% endblock %}
+
 {% block og_description %}{% translate "Some ground rules for the community" %}{% endblock %}
 
 {% block content %}
@@ -558,4 +559,4 @@
     {% endblocktranslate %}
   </p>
 
-{% endblock %}
+{% endblock content %}
diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html
index 79ce06fc..1b810043 100644
--- a/djangoproject/templates/conduct/reporting.html
+++ b/djangoproject/templates/conduct/reporting.html
@@ -4,6 +4,7 @@
 {% block title %}{% translate "Django Code of Conduct - Reporting Guide" %}{% endblock %}
 
 {% block og_title %}{% translate "Django Code of Conduct - Reporting Guide" %}{% endblock %}
+
 {% block og_description %}{% translate "A guide to reporting issues in the community" %}{% endblock %}
 
 {% block content %}
@@ -259,11 +260,11 @@
   <h3 id="conflicts-of-interest">{% translate "Conflicts of Interest" %} <a class="plink" href="#conflicts-of-interest">#</a></h3>
 
   <p>
-    {% blocktrans trimmed %}
+    {% blocktranslate 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 %}
+    {% endblocktranslate %}
   </p>
 
   <ul>
@@ -383,4 +384,4 @@
       decision-making. The board may request access to records for oversight purposes.
     {% endblocktranslate %}
   </p>
-{% endblock %}
+{% endblock content %}