summaryrefslogtreecommitdiff
path: root/docs/narr/templates.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-24 03:56:48 -0400
committerChris McDonough <chrism@plope.com>2011-09-24 03:56:48 -0400
commit4937d9e5280fff849b346dcf6c1833ef6fe95119 (patch)
tree69fe13b7853a3da419b03a7987e92e43753b65b5 /docs/narr/templates.rst
parentbfb71c175bb5de7a0c22599979d269d92f12ed27 (diff)
parent9a784a4c94946872c493627e4295a26a3e608439 (diff)
downloadpyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.tar.gz
pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.tar.bz2
pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/templates.rst')
-rw-r--r--docs/narr/templates.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 6412c070d..052843a23 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -46,7 +46,9 @@ within the body of a view callable like so:
{'foo':1, 'bar':2},
request=request)
-.. warning:: Earlier iterations of this documentation
+.. warning::
+
+ Earlier iterations of this documentation
(pre-version-1.3) encouraged the application developer to use
ZPT-specific APIs such as
:func:`pyramid.chameleon_zpt.render_template_to_response` and