diff options
| author | Rob Ruana <rob@relentlessidiot.com> | 2014-01-18 13:56:23 -0500 |
|---|---|---|
| committer | Rob Ruana <rob@relentlessidiot.com> | 2014-01-18 13:56:23 -0500 |
| commit | a00a096069f44bbb131fe22414fb3053f3ef9fd6 (patch) | |
| tree | 80353d58daec3704f0a6f30783df554a8f0d0bc6 /doc/conf.py | |
| parent | dbd544d12bdfc64ec28dacb08f8a8ab9a40d81f7 (diff) | |
| download | sphinx-git-a00a096069f44bbb131fe22414fb3053f3ef9fd6.tar.gz | |
Merges napoleon extension into mainline sphinx
Diffstat (limited to 'doc/conf.py')
| -rw-r--r-- | doc/conf.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/conf.py b/doc/conf.py index 08149fba5..b6515a38d 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -5,8 +5,10 @@ import re import sphinx + extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', - 'sphinx.ext.autosummary', 'sphinx.ext.extlinks'] + 'sphinx.ext.autosummary', 'sphinx.ext.extlinks', + 'sphinx.ext.napoleon'] master_doc = 'contents' templates_path = ['_templates'] |