diff options
| author | Steve Piercy <web@stevepiercy.com> | 2015-12-23 02:37:45 -0800 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2015-12-23 02:37:45 -0800 |
| commit | aafaa8e978e6f7759eaac8743b1c1f1fd8b63629 (patch) | |
| tree | d16e50a086e6eb066661adf52a50e1e3dffe87e2 /docs/conf.py | |
| parent | 7593b05e4b4bd0bc85c5f46964b4e4a55286ad49 (diff) | |
| parent | d9da2b29861d071b9fc044319421799a3d522bcc (diff) | |
| download | pyramid-aafaa8e978e6f7759eaac8743b1c1f1fd8b63629.tar.gz pyramid-aafaa8e978e6f7759eaac8743b1c1f1fd8b63629.tar.bz2 pyramid-aafaa8e978e6f7759eaac8743b1c1f1fd8b63629.zip | |
Merge pull request #2191 from stevepiercy/master
add p* scripts output for --help
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/conf.py b/docs/conf.py index 8a9bac6ed..073811eca 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,12 +53,13 @@ extensions = [ 'sphinx.ext.doctest', 'repoze.sphinx.autointerface', 'sphinx.ext.viewcode', - 'sphinx.ext.intersphinx' + 'sphinx.ext.intersphinx', + 'sphinxcontrib.programoutput', ] # Looks for objects in external projects intersphinx_mapping = { - 'colander': ( 'http://docs.pylonsproject.org/projects/colander/en/latest', None), + 'colander': ('http://docs.pylonsproject.org/projects/colander/en/latest', None), 'cookbook': ('http://docs.pylonsproject.org/projects/pyramid-cookbook/en/latest/', None), 'deform': ('http://docs.pylonsproject.org/projects/deform/en/latest', None), 'jinja2': ('http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None), @@ -66,8 +67,8 @@ intersphinx_mapping = { 'python': ('http://docs.python.org', None), 'python3': ('http://docs.python.org/3', None), 'sqla': ('http://docs.sqlalchemy.org/en/latest', None), - 'tm': ('http://docs.pylonsproject.org/projects/pyramid_tm/en/latest/', None), - 'toolbar': ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None), + 'tm': ('http://docs.pylonsproject.org/projects/pyramid_tm/en/latest/', None), + 'toolbar': ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None), 'tstring': ('http://docs.pylonsproject.org/projects/translationstring/en/latest', None), 'tutorials': ('http://docs.pylonsproject.org/projects/pyramid-tutorials/en/latest/', None), 'venusian': ('http://docs.pylonsproject.org/projects/venusian/en/latest', None), |