diff options
| author | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-09-25 21:36:30 +0100 |
|---|---|---|
| committer | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-09-25 21:36:30 +0100 |
| commit | f01d50d695bf55f1af34b87c4e6c84f76dd9a36d (patch) | |
| tree | e98dc537312410d5661ae76c72306d3a8d2a8e49 /doc | |
| parent | 7ad0fcf22dbff5ee80a644e46429ff2ec3f25980 (diff) | |
| parent | eb5b3aa25dbc918c8250a2336aaaf2b753ad36b5 (diff) | |
| download | sphinx-git-f01d50d695bf55f1af34b87c4e6c84f76dd9a36d.tar.gz | |
Merge branch '5.x'
# Conflicts:
# CHANGES
# doc/conf.py
# sphinx/__init__.py
# sphinx/builders/html/__init__.py
# sphinx/domains/python.py
# tests/test_build_html.py
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/changes.rst | 7 | ||||
| -rw-r--r-- | doc/conf.py | 1 | ||||
| -rw-r--r-- | doc/extdev/deprecated.rst | 5 | ||||
| -rw-r--r-- | doc/latex.rst | 6 |
4 files changed, 19 insertions, 0 deletions
diff --git a/doc/changes.rst b/doc/changes.rst index 3fe902404..96853fe09 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -11,5 +11,12 @@ Changelog .. raw:: latex \addtocontents{toc}{\protect\setcounter{tocdepth}{1}}% + \makeatletter + \addtocontents{toc}% + {\def\string\l@section{\string\@dottedtocline{1}{1.5em}{3.3em}}} + \addtocontents{toc}% + {\def\string\l@subsection{\string\@dottedtocline{2}{4.8em}{4em}}} + \makeatother + .. include:: ../CHANGES diff --git a/doc/conf.py b/doc/conf.py index 58e8e6c27..f903fd570 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,6 +48,7 @@ epub_post_files = [('usage/installation.xhtml', 'Installing Sphinx'), ('develop.xhtml', 'Sphinx development')] epub_exclude_files = ['_static/opensearch.xml', '_static/doctools.js', '_static/searchtools.js', + '_static/sphinx_highlight.js', '_static/basic.css', '_static/language_data.js', 'search.html', '_static/websupport.js'] diff --git a/doc/extdev/deprecated.rst b/doc/extdev/deprecated.rst index 18b0e6d04..8c850ceb6 100644 --- a/doc/extdev/deprecated.rst +++ b/doc/extdev/deprecated.rst @@ -22,6 +22,11 @@ The following is a list of deprecated interfaces. - (will be) Removed - Alternatives + * - HTML 4 support + - 5.2 + - 7.0 + - N/A + * - ``sphinx.util.path_stabilize`` - 5.1 - 7.0 diff --git a/doc/latex.rst b/doc/latex.rst index 84dd2e433..7fa90fe89 100644 --- a/doc/latex.rst +++ b/doc/latex.rst @@ -1300,6 +1300,12 @@ Macros ``\sphinxtableofcontentshook``. This macro is also executed by the ``'howto'`` docclass, but defaults to empty with it. + .. hint:: + + If adding to preamble the loading of ``tocloft`` package, also add to + preamble ``\renewcommand\sphinxtableofcontentshook{}`` else it will reset + ``\l@section`` and ``\l@subsection`` cancelling ``tocloft`` customization. + - ``\sphinxmaketitle``: Used as the default setting of the ``'maketitle'`` :confval:`latex_elements` key. Defined in the class files :file:`sphinxmanual.cls` and |