diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2021-05-03 22:33:12 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2021-05-03 22:33:12 +0900 |
| commit | 3027a2f8675e6140f2d8b83d19bec4159a09af5c (patch) | |
| tree | d4db4de45fe517f165425014dd1d90fc9bb6816e /sphinx/ext/autodoc/directive.py | |
| parent | f5e7b9b815977790f940ffcc374550bb70fc99d4 (diff) | |
| parent | f31af4b8158e6142d918366aa0026e40575af914 (diff) | |
| download | sphinx-git-3027a2f8675e6140f2d8b83d19bec4159a09af5c.tar.gz | |
Merge branch '4.x'
Diffstat (limited to 'sphinx/ext/autodoc/directive.py')
| -rw-r--r-- | sphinx/ext/autodoc/directive.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/ext/autodoc/directive.py b/sphinx/ext/autodoc/directive.py index c58d0c411..a554adf68 100644 --- a/sphinx/ext/autodoc/directive.py +++ b/sphinx/ext/autodoc/directive.py @@ -30,7 +30,7 @@ logger = logging.getLogger(__name__) AUTODOC_DEFAULT_OPTIONS = ['members', 'undoc-members', 'inherited-members', 'show-inheritance', 'private-members', 'special-members', 'ignore-module-all', 'exclude-members', 'member-order', - 'imported-members'] + 'imported-members', 'class-doc-from'] AUTODOC_EXTENDABLE_OPTIONS = ['members', 'private-members', 'special-members', 'exclude-members'] |