aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorTom Christie2013-12-04 14:59:28 +0000
committerTom Christie2013-12-04 14:59:28 +0000
commit6446b44f01f06d7f5482798a16025ebcea75c024 (patch)
tree7edd3614a2a9b75d65ed05497a835302b5dcadc3 /docs
parentde5b9e39dd4c21f4dcceb7cf13c7366b0fb74ec9 (diff)
parent04a43ddca565d96848c25a1d1879c9e7a53a7b6c (diff)
downloaddjango-rest-framework-6446b44f01f06d7f5482798a16025ebcea75c024.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs')
-rw-r--r--docs/api-guide/viewsets.md2
-rw-r--r--docs/topics/release-notes.md1
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index 1062cb32..4fdd9364 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -170,7 +170,7 @@ The actions provided by the `ModelViewSet` class are `.list()`, `.retrieve()`,
#### Example
-Because `ModelViewSet` extends `GenericAPIView`, you'll normally need to provide at least the `queryset` and `serializer_class` attributes. For example:
+Because `ModelViewSet` extends `GenericAPIView`, you'll normally need to provide at least the `queryset` and `serializer_class` attributes, or the `model` attribute shortcut. For example:
class AccountViewSet(viewsets.ModelViewSet):
"""
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index f9ad55f7..e6085f59 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -44,6 +44,7 @@ You can determine your currently installed version using `pip freeze`:
* Add in choices information for ChoiceFields in response to `OPTIONS` requests.
* Added `pre_delete()` and `post_delete()` method hooks.
+* Bugfix: Responses without any content no longer include an HTTP `'Content-Type'` header.
* Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400.
### 2.3.9