diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:09:59 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:09:59 -0700 |
| commit | a2dff0592714d9cde5a0a612411aa96ce9d94b3c (patch) | |
| tree | 6dac581990ba758670a8424cafe8bf31888471f7 /docs/conf.py | |
| parent | 29e1002a108d045e1f80be3137f2cde4e47ca642 (diff) | |
| parent | 5558386fd1a6181b2e8ad06659049c055a7ed023 (diff) | |
| download | pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.gz pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.bz2 pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.zip | |
Merge branch 'master' into feature/alchemy-scaffold-update
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), |