From b29cacbf6bd7e723036db88cdb5b1aec1c2fe43d Mon Sep 17 00:00:00 2001
From: Maciej Olko <maciej.olko@affirm.com>
Date: Fri, 9 May 2025 00:53:31 +0200
Subject: [PATCH 1/2] Remove link elements in builders other than html

This change fixes EPUBs
---
 Doc/tools/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index 56023ebf962703..c06590b24c8fc4 100644
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@@ -29,7 +29,7 @@
     {% if builder == "html" and enable_analytics %}
       <script defer data-domain="docs.python.org" src="https://analytics.python.org/js/script.outbound-links.js"></script>
     {% endif %}
-    <link rel="canonical" href="https://docs.python.org/3/{{pagename}}.html">
+    {% if builder == "html" %}<link rel="canonical" href="https://docs.python.org/3/{{pagename}}.html">{% endif %}
     {% if builder != "htmlhelp" %}
       {% if pagename == 'whatsnew/changelog' and not embedded %}
       <script type="text/javascript" src="{{ pathto('_static/changelog_search.js', 1) }}"></script>{% endif %}

From 8cf4e4f14fa59bd57936e712a68f482b566062c7 Mon Sep 17 00:00:00 2001
From: Maciej Olko <maciej.olko@affirm.com>
Date: Tue, 13 May 2025 18:54:31 +0200
Subject: [PATCH 2/2] Group together html-builder-specific tags

---
 Doc/tools/templates/layout.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index c06590b24c8fc4..1cb0200822d9fe 100644
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@@ -26,11 +26,11 @@
 {% endblock %}
 
 {% block extrahead %}
-    {% if builder == "html" and enable_analytics %}
+    {% if builder == "html" %}
+      {% if enable_analytics %}
       <script defer data-domain="docs.python.org" src="https://analytics.python.org/js/script.outbound-links.js"></script>
-    {% endif %}
-    {% if builder == "html" %}<link rel="canonical" href="https://docs.python.org/3/{{pagename}}.html">{% endif %}
-    {% if builder != "htmlhelp" %}
+      {% endif %}
+      <link rel="canonical" href="https://docs.python.org/3/{{pagename}}.html">
       {% if pagename == 'whatsnew/changelog' and not embedded %}
       <script type="text/javascript" src="{{ pathto('_static/changelog_search.js', 1) }}"></script>{% endif %}
     {% endif %}