summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorgoodwillcoding <goodwillcoding@webhippo.net>2013-02-11 01:15:25 -0800
committergoodwillcoding <goodwillcoding@webhippo.net>2013-02-11 01:15:25 -0800
commit83959584d2bd25bedc43cab38a9d932d0f0eea75 (patch)
tree6b240618dcd8b74e2513ceb0b6c0a0308cb1e56c /docs/narr
parentc7a06f41d56d076dc979d800388c8befc1b8e5e5 (diff)
parent179f8c3e5c96ebef06710a0c214409aadd94ada5 (diff)
downloadpyramid-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/narr')
-rw-r--r--docs/narr/subrequest.rst4
1 files changed, 1 insertions, 3 deletions
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