diff options
| author | Nikolaus Schlemm | 2013-05-19 09:02:07 +0200 |
|---|---|---|
| committer | Nikolaus Schlemm | 2013-05-19 09:02:07 +0200 |
| commit | 9454e23aa927931dcb7a6921c6ad238f6369e64e (patch) | |
| tree | 967fcbf13b3186a187c72ca9645cb24dbf6b425a /docs | |
| parent | 843ae6023753a0373eb2e6398ddda93e4da74de5 (diff) | |
| parent | 7c945b43f05f1b340f78c23f80c8043937c7fd2a (diff) | |
| download | django-rest-framework-9454e23aa927931dcb7a6921c6ad238f6369e64e.tar.bz2 | |
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api-guide/renderers.md | 6 | ||||
| -rw-r--r-- | docs/topics/credits.md | 4 |
2 files changed, 9 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. diff --git a/docs/topics/credits.md b/docs/topics/credits.md index d805c0c1..acd6576e 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -130,6 +130,8 @@ The following people have helped make REST framework great. * Òscar Vilaplana - [grimborg] * Ryan Kaskel - [ryankask] * Andy McKay - [andymckay] +* Matteo Suppo - [matteosuppo] +* Karol Majta - [lolek09] Many thanks to everyone who's contributed to the project. @@ -296,3 +298,5 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [grimborg]: https://github.com/grimborg [ryankask]: https://github.com/ryankask [andymckay]: https://github.com/andymckay +[matteosuppo]: https://github.com/matteosuppo +[lolek09]: https://github.com/lolek09 |