IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' into master

Browse Source
This commit is contained in:
Takeshi KOMIYA
2020-10-28 02:23:36 +09:00
parent f1af7dc84f 2c2335bbb8
commit c40b4249cd
22 changed files with 98 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/usage/configuration.rst
View File

@@ -316,6 +316,7 @@ General configuration
* ``toc.circular``
* ``toc.secnum``
* ``epub.unknown_project_files``
* ``epub.duplicated_toc_entry``
* ``autosectionlabel.*``
You can choose from these types.
@@ -340,6 +341,10 @@ General configuration
Added ``autosectionlabel.*``
.. versionchanged:: 3.3.0
Added ``epub.duplicated_toc_entry``
.. confval:: needs_sphinx
If set to a ``major.minor`` version string like ``'1.1'``, Sphinx will