diff options
| author | Tom Christie | 2013-05-18 17:22:27 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-05-18 17:22:27 +0100 |
| commit | bac4bf6e95d6cc6828115bd0a79cd524a6abd163 (patch) | |
| tree | 431794e91dec87c099ffb3dcce8a50c4ce0507e7 /docs/api-guide | |
| parent | 0d3d66cb0232e1067600ef22fcf88937ac6bee9d (diff) | |
| parent | 6af61a19b78b0ebb9d8403e96c6e4a77c675b141 (diff) | |
| download | django-rest-framework-bac4bf6e95d6cc6828115bd0a79cd524a6abd163.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs/api-guide')
| -rw-r--r-- | docs/api-guide/renderers.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index b9a9fd7a..1661ceec 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -67,7 +67,7 @@ If your API includes views that can serve both regular webpages and API response ## JSONRenderer -Renders the request data into `JSON`. +Renders the request data into `JSON` enforcing ASCII encoding The client may additionally include an `'indent'` media type parameter, in which case the returned `JSON` will be indented. For example `Accept: application/json; indent=4`. @@ -75,6 +75,10 @@ The client may additionally include an `'indent'` media type parameter, in which **.format**: `'.json'` +## UnicodeJSONRenderer + +Same as `JSONRenderer` but doesn't enforce ASCII encoding + ## JSONPRenderer Renders the request data into `JSONP`. The `JSONP` media type provides a mechanism of allowing cross-domain AJAX requests, by wrapping a `JSON` response in a javascript callback. |