From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Fri, 10 May 2024 10:40:35 +0000 (+0200) Subject: gh-118689: Doc: fix ePub build (GH-118690) X-Git-Tag: v3.13.0b2~240 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=760b3f08dc9932d1595982b527c3bd187681ff49;p=thirdparty%2FPython%2Fcpython.git gh-118689: Doc: fix ePub build (GH-118690) (cherry picked from commit 7ac933e2609b2ef9b08ccf9c815b682b0e1ede2a) Co-authored-by: Inada Naoki --- diff --git a/Doc/conf.py b/Doc/conf.py index 86371d17ae74..0e86de837d35 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -435,6 +435,10 @@ latex_appendices = ['glossary', 'about', 'license', 'copyright'] epub_author = 'Python Documentation Authors' epub_publisher = 'Python Software Foundation' +# index pages are not valid xhtml +# https://github.com/sphinx-doc/sphinx/issues/12359 +epub_use_index = False + # Options for the coverage checker # -------------------------------- diff --git a/Doc/library/allos.rst b/Doc/library/allos.rst index f7105d8af8e2..0223c1054ea5 100644 --- a/Doc/library/allos.rst +++ b/Doc/library/allos.rst @@ -16,7 +16,6 @@ but they are available on most other systems as well. Here's an overview: io.rst time.rst argparse.rst - getopt.rst logging.rst logging.config.rst logging.handlers.rst diff --git a/Doc/tools/extensions/glossary_search.py b/Doc/tools/extensions/glossary_search.py index 59a6862ea3d3..232782093926 100644 --- a/Doc/tools/extensions/glossary_search.py +++ b/Doc/tools/extensions/glossary_search.py @@ -20,7 +20,7 @@ JSON = 'glossary.json' def process_glossary_nodes(app, doctree, fromdocname): - if app.builder.format != 'html': + if app.builder.format != 'html' or app.builder.embedded: return terms = {} diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html index 3c12b01b558f..e931147813ae 100644 --- a/Doc/tools/templates/layout.html +++ b/Doc/tools/templates/layout.html @@ -42,6 +42,7 @@ {{ super() }} +{%- if not embedded %} +{%- endif %} {% endblock %}