summaryrefslogtreecommitdiff
path: root/sphinx/ext/autodoc/__init__.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2020-04-18 21:54:31 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2020-04-18 21:54:31 +0900
commitadad0e62bb25ce172eb1aa678ba9c441ed1f145c (patch)
tree2f0627e4e60e2d86cacc062da5cada1eb1b1cd14 /sphinx/ext/autodoc/__init__.py
parentc90b23c2c7b7e9a8371223e354554a6fa5529708 (diff)
parent21341f4b6cca355edf410b50b9cc37c075e4e193 (diff)
downloadsphinx-git-adad0e62bb25ce172eb1aa678ba9c441ed1f145c.tar.gz
Merge branch '3.x'
Diffstat (limited to 'sphinx/ext/autodoc/__init__.py')
-rw-r--r--sphinx/ext/autodoc/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py
index f62b0c1a8..a0d1f6e32 100644
--- a/sphinx/ext/autodoc/__init__.py
+++ b/sphinx/ext/autodoc/__init__.py
@@ -1754,9 +1754,8 @@ def setup(app: Sphinx) -> Dict[str, Any]:
app.add_autodocumenter(InstanceAttributeDocumenter)
app.add_autodocumenter(SlotsAttributeDocumenter)
- app.add_config_value('autoclass_content', 'class', True)
+ app.add_config_value('autoclass_content', 'class', True, ENUM('both', 'class', 'init'))
app.add_config_value('autodoc_member_order', 'alphabetic', True)
- app.add_config_value('autodoc_default_flags', [], True)
app.add_config_value('autodoc_default_options', {}, True)
app.add_config_value('autodoc_docstring_signature', True, True)
app.add_config_value('autodoc_mock_imports', [], True)