summaryrefslogtreecommitdiff
path: root/tests/root
diff options
context:
space:
mode:
authorRob Ruana <rob@relentlessidiot.com>2014-01-18 13:56:23 -0500
committerRob Ruana <rob@relentlessidiot.com>2014-01-18 13:56:23 -0500
commitd6498e009d54c1be6ae2d68e4c86c651dc108ee1 (patch)
tree80353d58daec3704f0a6f30783df554a8f0d0bc6 /tests/root
parent9006c74ab6d9826ccac75fd7ad1da6419de9890b (diff)
downloadsphinx-d6498e009d54c1be6ae2d68e4c86c651dc108ee1.tar.gz
Merges napoleon extension into mainline sphinx
Diffstat (limited to 'tests/root')
-rw-r--r--tests/root/conf.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/root/conf.py b/tests/root/conf.py
index 8025ba33..9b881760 100644
--- a/tests/root/conf.py
+++ b/tests/root/conf.py
@@ -8,7 +8,8 @@ sys.path.append(os.path.abspath('..'))
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.jsmath', 'sphinx.ext.todo',
'sphinx.ext.coverage', 'sphinx.ext.autosummary',
'sphinx.ext.doctest', 'sphinx.ext.extlinks',
- 'sphinx.ext.viewcode', 'sphinx.ext.oldcmarkup', 'ext']
+ 'sphinx.ext.viewcode', 'sphinx.ext.oldcmarkup',
+ 'sphinx.ext.napoleon', 'ext']
jsmath_path = 'dummy.js'