From bf5471f4de35dcf4fea76a340b3b8e4fc5d793ab Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 8 Apr 2025 00:06:06 +0300 Subject: [PATCH] [3.13] Docs HTML: Remove self-closing tags (GH-132220) (#132228) (cherry picked from commit ce724571b35f4e79fff1c862fcd9afa4c26b605f) Co-authored-by: Adam Turner <9087854+aa-turner@users.noreply.github.com> --- Doc/conf.py | 6 ++--- Doc/includes/email-alternative.py | 2 +- Doc/tools/templates/indexcontent.html | 34 +++++++++++++-------------- Doc/tools/templates/layout.html | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Doc/conf.py b/Doc/conf.py index 06dc1f29aa7c..c73a4d09617f 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -620,7 +620,7 @@ ogp_site_url = 'https://docs.python.org/3/' ogp_site_name = 'Python documentation' ogp_image = '_static/og-image.png' ogp_custom_meta_tags = [ - '', - '', - '', + '', + '', + '', ] diff --git a/Doc/includes/email-alternative.py b/Doc/includes/email-alternative.py index 26b302b495c7..afe2b4fbb5eb 100644 --- a/Doc/includes/email-alternative.py +++ b/Doc/includes/email-alternative.py @@ -36,7 +36,7 @@ msg.add_alternative("""\ recette sera sûrement un très bon repas.

- + """.format(asparagus_cid=asparagus_cid[1:-1]), subtype='html') diff --git a/Doc/tools/templates/indexcontent.html b/Doc/tools/templates/indexcontent.html index f8367f6e3e10..06a4223643a0 100644 --- a/Doc/tools/templates/indexcontent.html +++ b/Doc/tools/templates/indexcontent.html @@ -23,30 +23,30 @@

{% trans %}Documentation sections:{% endtrans %}

-

{% trans %}What's new in Python {{ version }}?{% endtrans %}
+

{% trans %}What's new in Python {{ version }}?{% endtrans %}
{% trans whatsnew_index=pathto("whatsnew/index") %}Or all "What's new" documents since Python 2.0{% endtrans %}

-

{% trans %}Tutorial{% endtrans %}
+

{% trans %}Tutorial{% endtrans %}
{% trans %}Start here: a tour of Python's syntax and features{% endtrans %}

-

{% trans %}Library reference{% endtrans %}
+

{% trans %}Library reference{% endtrans %}
{% trans %}Standard library and builtins{% endtrans %}

-

{% trans %}Language reference{% endtrans %}
+

{% trans %}Language reference{% endtrans %}
{% trans %}Syntax and language elements{% endtrans %}

-

{% trans %}Python setup and usage{% endtrans %}
+

{% trans %}Python setup and usage{% endtrans %}
{% trans %}How to install, configure, and use Python{% endtrans %}

-

{% trans %}Python HOWTOs{% endtrans %}
+

{% trans %}Python HOWTOs{% endtrans %}
{% trans %}In-depth topic manuals{% endtrans %}

 -

{% trans %}Installing Python modules{% endtrans %}
+

{% trans %}Installing Python modules{% endtrans %}
{% trans %}Third-party modules and PyPI.org{% endtrans %}

-

{% trans %}Distributing Python modules{% endtrans %}
+

{% trans %}Distributing Python modules{% endtrans %}
{% trans %}Publishing modules for use by other people{% endtrans %}

-

{% trans %}Extending and embedding{% endtrans %}
+

{% trans %}Extending and embedding{% endtrans %}
{% trans %}For C/C++ programmers{% endtrans %}

-

{% trans %}Python's C API{% endtrans %}
+

{% trans %}Python's C API{% endtrans %}
{% trans %}C API reference{% endtrans %}

-

{% trans %}FAQs{% endtrans %}
+

{% trans %}FAQs{% endtrans %}
{% trans %}Frequently asked questions (with answers!){% endtrans %}

-

{% trans %}Deprecations{% endtrans %}
+

{% trans %}Deprecations{% endtrans %}
{% trans %}Deprecated functionality{% endtrans %}

@@ -54,16 +54,16 @@

{% trans %}Indices, glossary, and search:{% endtrans %}

-

{% trans %}Global module index{% endtrans %}
+

{% trans %}Global module index{% endtrans %}
{% trans %}All modules and libraries{% endtrans %}

-

{% trans %}General index{% endtrans %}
+

{% trans %}General index{% endtrans %}
{% trans %}All functions, classes, and terms{% endtrans %}

-

{% trans %}Glossary{% endtrans %}
+

{% trans %}Glossary{% endtrans %}
{% trans %}Terms explained{% endtrans %}

 -

{% trans %}Search page{% endtrans %}
+

{% trans %}Search page{% endtrans %}
{% trans %}Search this documentation{% endtrans %}

-

{% trans %}Complete table of contents{% endtrans %}
+

{% trans %}Complete table of contents{% endtrans %}
{% trans %}Lists all sections and subsections{% endtrans %}

diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html index b09fd21a8ddc..10a87f50d856 100644 --- a/Doc/tools/templates/layout.html +++ b/Doc/tools/templates/layout.html @@ -29,7 +29,7 @@ {% if builder == "html" and enable_analytics %} {% endif %} - + {% if builder != "htmlhelp" %} {% if pagename == 'whatsnew/changelog' and not embedded %} {% endif %} -- 2.47.3