diff options
| author | goodwillcoding <goodwillcoding@webhippo.net> | 2013-02-11 01:15:25 -0800 |
|---|---|---|
| committer | goodwillcoding <goodwillcoding@webhippo.net> | 2013-02-11 01:15:25 -0800 |
| commit | 83959584d2bd25bedc43cab38a9d932d0f0eea75 (patch) | |
| tree | 6b240618dcd8b74e2513ceb0b6c0a0308cb1e56c /docs | |
| parent | c7a06f41d56d076dc979d800388c8befc1b8e5e5 (diff) | |
| parent | 179f8c3e5c96ebef06710a0c214409aadd94ada5 (diff) | |
| download | pyramid-83959584d2bd25bedc43cab38a9d932d0f0eea75.tar.gz pyramid-83959584d2bd25bedc43cab38a9d932d0f0eea75.tar.bz2 pyramid-83959584d2bd25bedc43cab38a9d932d0f0eea75.zip | |
Merge pull request #857 from tshepang/diff
bring back intersphinx
thank you
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 24 | ||||
| -rw-r--r-- | docs/narr/subrequest.rst | 4 |
2 files changed, 13 insertions, 15 deletions
diff --git a/docs/conf.py b/docs/conf.py index 6eb76af9d..8d22d4d42 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,20 +50,20 @@ extensions = [ 'sphinx.ext.doctest', 'repoze.sphinx.autointerface', 'sphinx.ext.viewcode', -# 'sphinx.ext.intersphinx' + 'sphinx.ext.intersphinx' ] -# Looks for objects in other Pyramid projects -## intersphinx_mapping = { -## 'cookbook': -## ('http://docs.pylonsproject.org/projects/pyramid_cookbook/dev/', None), -## 'handlers': -## ('http://docs.pylonsproject.org/projects/pyramid_handlers/dev/', None), -## 'zcml': -## ('http://docs.pylonsproject.org/projects/pyramid_zcml/dev/', None), -## 'jinja2': -## ('http://docs.pylonsproject.org/projects/pyramid_jinja2/dev/', None), -## } +# Looks for objects in external projects +intersphinx_mapping = { + 'who': ('http://docs.repoze.org/who/2.0', None), + 'python': ('http://docs.python.org', None), + 'python3': ('http://docs.python.org/3', None), + 'tstring': + ('http://docs.pylonsproject.org/projects/translationstring/en/latest', + None), + 'venusian': + ('http://docs.pylonsproject.org/projects/venusian/en/latest', None), +} # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] diff --git a/docs/narr/subrequest.rst b/docs/narr/subrequest.rst index b5bc5ec48..033f045a6 100644 --- a/docs/narr/subrequest.rst +++ b/docs/narr/subrequest.rst @@ -6,9 +6,7 @@ Invoking a Subrequest ===================== -.. warning:: - - This feature was added in Pyramid 1.4a1. +.. versionadded:: 1.4 :app:`Pyramid` allows you to invoke a subrequest at any point during the processing of a request. Invoking a subrequest allows you to obtain a |