diff options
| author | Chris McDonough <chrism@plope.com> | 2013-11-11 20:43:12 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-11-11 20:43:12 -0500 |
| commit | 133b9e069cdd5a48d47e2bb2587186a91b255700 (patch) | |
| tree | 128ab0fc433c0317bbc13ae44e9e31e6ab70bc86 /docs/api | |
| parent | e5a0ca90d16ce78e05db71253720fa3082d8da2d (diff) | |
| parent | 19d5fe09bb37d3694f63884eb5a95158f4252473 (diff) | |
| download | pyramid-133b9e069cdd5a48d47e2bb2587186a91b255700.tar.gz pyramid-133b9e069cdd5a48d47e2bb2587186a91b255700.tar.bz2 pyramid-133b9e069cdd5a48d47e2bb2587186a91b255700.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/renderers.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/api/renderers.rst b/docs/api/renderers.rst index ea000ad02..0caca02b4 100644 --- a/docs/api/renderers.rst +++ b/docs/api/renderers.rst @@ -13,8 +13,12 @@ .. autoclass:: JSON + .. automethod:: add_adapter + .. autoclass:: JSONP + .. automethod:: add_adapter + .. attribute:: null_renderer An object that can be used in advanced integration cases as input to the |