diff options
| author | Georg Brandl <georg@python.org> | 2012-01-29 10:06:49 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-01-29 10:06:49 +0100 |
| commit | 3f2c019ea7f8e009717bcca0b7b16f4474ac7913 (patch) | |
| tree | 1b32b5b34c1d2fdf1ec48b2f31dd3df635c10994 | |
| parent | 00ed3ae8a9086cb12eac343e7ba278ff1c4457c2 (diff) | |
| parent | 1d188e778f7add99871ec7e164c0f915493a7544 (diff) | |
| download | sphinx-git-3f2c019ea7f8e009717bcca0b7b16f4474ac7913.tar.gz | |
Merged in frasertweedale/sphinx (pull request #37)
| -rw-r--r-- | sphinx/apidoc.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py index 16566761b..ec1a8a33f 100644 --- a/sphinx/apidoc.py +++ b/sphinx/apidoc.py @@ -20,12 +20,15 @@ import optparse from os import path # automodule options -OPTIONS = [ - 'members', - 'undoc-members', - # 'inherited-members', # disabled because there's a bug in sphinx - 'show-inheritance', -] +if 'SPHINX_APIDOC_OPTIONS' in os.environ: + OPTIONS = os.environ['SPHINX_APIDOC_OPTIONS'].split(',') +else: + OPTIONS = [ + 'members', + 'undoc-members', + # 'inherited-members', # disabled because there's a bug in sphinx + 'show-inheritance', + ] INITPY = '__init__.py' |