diff options
| author | Chris McDonough <chrism@plope.com> | 2013-05-21 15:32:01 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-05-21 15:32:01 -0400 |
| commit | 1f0106e2debcfc82e17c55385ce9a01985ae458c (patch) | |
| tree | d51720ba9314c23d0a7e9f5d7a6e9d7f238bf24b /docs/conf.py | |
| parent | d64fa6136d0dec6717b273362de548d8f3bf47e8 (diff) | |
| parent | d037a9d47b6dd8fe6da88c6a6e26ceefcfe00fc9 (diff) | |
| download | pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.tar.gz pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.tar.bz2 pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py index 1ddcae08e..84b01a791 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -70,6 +70,9 @@ intersphinx_mapping = { 'toolbar': ('http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest', None), + 'zcml': + ('http://docs.pylonsproject.org/projects/pyramid_zcml/en/latest', + None), } # Add any paths that contain templates here, relative to this directory. @@ -167,7 +170,7 @@ html_theme_path = ['_themes'] html_theme = 'pyramid' html_theme_options = dict( github_url='https://github.com/Pylons/pyramid', -# in_progress='true', + in_progress='true', ) # The style sheet to use for HTML and HTML Help pages. A file of that name # must exist either in Sphinx' static/ path, or in one of the custom paths |