From 62ca01f678d7834dd7c5e9213819847db46151f2 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 13 Oct 2020 18:25:50 +0200 Subject: [PATCH] Update layout and sphinx version --- docs/requirements.txt | 6 +++--- docs/source/_templates/package.rst_t | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 57af5eabd8..cba2a17f50 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,8 +1,8 @@ # requirements for building the docs -sphinx==3.1.1 -# sphinx-multiversion latest -git+https://github.com/Holzhaus/sphinx-multiversion.git@master#egg=sphinx-multiversion +sphinx==3.2.1 +sphinx-multiversion==0.2.4 +# lunr==0.5.8 # recommonmark custom branch with evennia-specific fixes git+https://github.com/evennia/recommonmark.git@evennia-mods#egg=recommonmark diff --git a/docs/source/_templates/package.rst_t b/docs/source/_templates/package.rst_t index 1a268d41bb..58f6b13570 100644 --- a/docs/source/_templates/package.rst_t +++ b/docs/source/_templates/package.rst_t @@ -7,7 +7,7 @@ {%- macro toctree(docnames) -%} .. toctree:: - :maxdepth: 6 + :maxdepth: {{ maxdepth }} {% for docname in docnames %} {{ docname }} {%- endfor %} @@ -31,8 +31,7 @@ Module contents {% endif %} {%- if submodules %} -Modules -------- + {% if separatemodules %} {{ toctree(submodules) }} {%- else %} @@ -47,8 +46,6 @@ Modules {%- if subpackages %} -Packages/folders ----------------- {{ toctree(subpackages) }} {% endif %}