aboutsummaryrefslogtreecommitdiffstats
path: root/docs/api-guide/generic-views.md
diff options
context:
space:
mode:
authorTom Christie2013-04-25 17:39:33 +0100
committerTom Christie2013-04-25 17:39:33 +0100
commit9abaf77401573e932ba4770248c1e229a8bc25dd (patch)
tree7046218b69f835c8485c7ca1a816d53b7e2499f9 /docs/api-guide/generic-views.md
parentb14b58498943c0a8f88c8ff931048bca4c90554b (diff)
downloaddjango-rest-framework-9abaf77401573e932ba4770248c1e229a8bc25dd.tar.bz2
More viewset/router docs
Diffstat (limited to 'docs/api-guide/generic-views.md')
-rwxr-xr-xdocs/api-guide/generic-views.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md
index 9d09af7f..4a24b7c7 100755
--- a/docs/api-guide/generic-views.md
+++ b/docs/api-guide/generic-views.md
@@ -147,8 +147,8 @@ You won't typically need to override the following methods, although you might n
* `get_serializer_context(self)` - Returns a dictionary containing any extra context that should be supplied to the serializer. Defaults to including `'request'`, `'view'` and `'format'` keys.
* `get_serializer(self, instance=None, data=None, files=None, many=False, partial=False)` - Returns a serializer instance.
* `get_pagination_serializer(self, page)` - Returns a serializer instance to use with paginated data.
-* `paginate_queryset(self, queryset, page_size)` - Paginate a queryset.
-* `filter_queryset(self, queryset)` - Given a queryset, filter it with whichever filter backend is in use.
+* `paginate_queryset(self, queryset)` - Paginate a queryset if required, either returning a page object, or `None` if pagination is not configured for this view.
+* `filter_queryset(self, queryset)` - Given a queryset, filter it with whichever filter backend is in use, returning a new queryset.
---