diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-01 03:17:19 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-01 03:17:19 -0400 |
| commit | a7eba78fdb75e85b136b8b13add98c61f16a3790 (patch) | |
| tree | 8c49cd4180ab15f792aab8f507bd2b230771bb4c /docs/narr/renderers.rst | |
| parent | a9289d95036eb23e973815e529d3db3fea235046 (diff) | |
| parent | 9e99e37432fe494b21c1aa7c4b381ece5c9b2727 (diff) | |
| download | pyramid-a7eba78fdb75e85b136b8b13add98c61f16a3790.tar.gz pyramid-a7eba78fdb75e85b136b8b13add98c61f16a3790.tar.bz2 pyramid-a7eba78fdb75e85b136b8b13add98c61f16a3790.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/renderers.rst')
| -rw-r--r-- | docs/narr/renderers.rst | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst index 57b5bc65b..63287e2cd 100644 --- a/docs/narr/renderers.rst +++ b/docs/narr/renderers.rst @@ -306,7 +306,9 @@ See :class:`pyramid.renderers.JSON` and JSONP Renderer ~~~~~~~~~~~~~~ -.. note:: This feature is new in Pyramid 1.1. +.. note:: + + This feature is new in Pyramid 1.1. :class:`pyramid.renderers.JSONP` is a `JSONP <http://en.wikipedia.org/wiki/JSONP>`_ renderer factory helper which |