aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorTom Christie2013-07-15 11:39:24 +0100
committerTom Christie2013-07-15 11:39:24 +0100
commitce5e8f8946d2fae416425d8d03af6d61380dc198 (patch)
treefbe801baaa3c1f8c12955d4674f9bc157f5e6a05 /docs
parentae63c49777f4d5b766b85a4b28f6328bd6f9516a (diff)
parentae5219dc7009598dffb7673d54fc71f01c209f05 (diff)
downloaddjango-rest-framework-ce5e8f8946d2fae416425d8d03af6d61380dc198.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs')
-rw-r--r--docs/api-guide/viewsets.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md
index 25d11bfb..17c528b3 100644
--- a/docs/api-guide/viewsets.md
+++ b/docs/api-guide/viewsets.md
@@ -205,9 +205,9 @@ You may need to provide custom `ViewSet` classes that do not have the full set o
To create a base viewset class that provides `create`, `list` and `retrieve` operations, inherit from `GenericViewSet`, and mixin the required actions:
- class CreateListRetrieveViewSet(mixins.CreateMixin,
- mixins.ListMixin,
- mixins.RetrieveMixin,
+ class CreateListRetrieveViewSet(mixins.CreateModelMixin,
+ mixins.ListModelMixin,
+ mixins.RetrieveModelMixin,
viewsets.GenericViewSet):
"""
A viewset that provides `retrieve`, `update`, and `list` actions.