diff options
| author | Chris McDonough <chrism@plope.com> | 2012-03-29 04:22:32 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-03-29 04:22:32 -0400 |
| commit | c24be2c07cad921c411d105a17a0d6cf9583b7df (patch) | |
| tree | 226eca892311341011e5cdcaf5e4861e65e9d6ae /docs/api | |
| parent | 4321a443da2443e3097af254f285a50d81449b0f (diff) | |
| parent | de797c4cefb03f16cfe3505c85d94c0af24eb066 (diff) | |
| download | pyramid-c24be2c07cad921c411d105a17a0d6cf9583b7df.tar.gz pyramid-c24be2c07cad921c411d105a17a0d6cf9583b7df.tar.bz2 pyramid-c24be2c07cad921c411d105a17a0d6cf9583b7df.zip | |
Merge branch 'wwitzel3-json-api'
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 312aa0b31..ab182365e 100644 --- a/docs/api/renderers.rst +++ b/docs/api/renderers.rst @@ -11,8 +11,12 @@ .. autofunction:: render_to_response +.. autoclass:: JSON + .. autoclass:: JSONP +.. autoclass:: ObjectJSONEncoder + .. attribute:: null_renderer An object that can be used in advanced integration cases as input to the |