diff options
| author | pierregm <pierregmcode@gmail.com> | 2010-10-11 23:02:10 +0200 |
|---|---|---|
| committer | pierregm <pierregmcode@gmail.com> | 2010-10-11 23:02:10 +0200 |
| commit | a14dd542532d383610c1b01c5698b137dd058fea (patch) | |
| tree | 036f0452ee16fe1b9b74c13e6ad9bb9155310256 /doc/sphinxext/docscrape_sphinx.py | |
| parent | 61d945bdb5c9b2b3329e1b8468b5c7d0596dd9fc (diff) | |
| parent | 11ee694744f2552d77652ed929fdc2b4ccca6843 (diff) | |
| download | numpy-a14dd542532d383610c1b01c5698b137dd058fea.tar.gz | |
merging refs/remotes/origin/master into HEAD
Diffstat (limited to 'doc/sphinxext/docscrape_sphinx.py')
| -rw-r--r-- | doc/sphinxext/docscrape_sphinx.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/sphinxext/docscrape_sphinx.py b/doc/sphinxext/docscrape_sphinx.py index 9f4350d46..e44e770ef 100644 --- a/doc/sphinxext/docscrape_sphinx.py +++ b/doc/sphinxext/docscrape_sphinx.py @@ -178,7 +178,8 @@ class SphinxDocString(NumpyDocString): out += self._str_index() + [''] out += self._str_summary() out += self._str_extended_summary() - for param_list in ('Parameters', 'Returns', 'Raises'): + for param_list in ('Parameters', 'Returns', 'Other Parameters', + 'Raises', 'Warns'): out += self._str_param_list(param_list) out += self._str_warnings() out += self._str_see_also(func_role) |