Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

2 files changed, 7 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..0e206de8 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -130,6 +130,7 @@ The following people have helped make REST framework great.
 * Òscar Vilaplana - [grimborg]
 * Ryan Kaskel - [ryankask]
 * Andy McKay - [andymckay]
+* Matteo Suppo - [matteosuppo]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -296,3 +297,4 @@ 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