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 '2.0' into refactor_citations

Browse Source
This commit is contained in:
Takeshi KOMIYA
2019-04-06 14:23:04 +09:00
parent 452e5dcf21 e5b15aeb9a
commit c840cb744c
28 changed files with 328 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/usage/extensions/autosummary.rst
View File

@@ -149,6 +149,16 @@ also use these config values:
:confval:`autodoc_mock_imports` for more details. It defaults to
:confval:`autodoc_mock_imports`.
.. versionadded:: 2.0
.. confval:: autosummary_imported_members
A boolean flag indicating whether to document classes and functions imported
in modules. Default is ``False``
.. versionadded:: 2.1
Customizing templates
---------------------

5
doc/usage/extensions/ifconfig.rst
View File

@@ -8,6 +8,11 @@
This extension is quite simple, and features only one directive:
.. warning::
This directive is designed to control only content of document. It could
not control sections, labels and so on.
.. rst:directive:: ifconfig
Include content of the directive only if the Python expression given as an