diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index a2f54b76b..a30bfb21d 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -160,7 +160,7 @@ You won't typically need to override the following methods, although you might n * `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)` - 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. +* `filter_queryset(self, queryset)` - Given a queryset, filter it with whichever filter backends are in use, returning a new queryset. --- diff --git a/docs/topics/credits.md b/docs/topics/credits.md index b998f9bdc..13f673c98 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -119,6 +119,7 @@ The following people have helped make REST framework great. * Matt Majewski - [forgingdestiny] * Jerome Chen - [chenjyw] * Andrew Hughes - [eyepulp] +* Daniel Hepper - [dhepper] Many thanks to everyone who's contributed to the project. @@ -273,3 +274,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [forgingdestiny]: https://github.com/forgingdestiny [chenjyw]: https://github.com/chenjyw [eyepulp]: https://github.com/eyepulp +[dhepper]: https://github.com/dhepper diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 205ee7e02..ed54a8765 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -204,7 +204,7 @@ We can also serialize querysets instead of model instances. To do so we simply ## Using ModelSerializers -Our `SnippetSerializer` class is replicating a lot of information that's also contained in the `Snippet` model. It would be nice if we could keep out code a bit more concise. +Our `SnippetSerializer` class is replicating a lot of information that's also contained in the `Snippet` model. It would be nice if we could keep our code a bit more concise. In the same way that Django provides both `Form` classes and `ModelForm` classes, REST framework includes both `Serializer` classes, and `ModelSerializer` classes. diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 8bb3164ba..f6c3efb03 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -143,7 +143,7 @@ Once you've created a few code snippets, navigate to the '/users/' endpoint, and ## Object level permissions -Really we'd like all code snippets to be visible to anyone, but also make sure that only the user that created a code snippet is able update or delete it. +Really we'd like all code snippets to be visible to anyone, but also make sure that only the user that created a code snippet is able to update or delete it. To do that we're going to need to create a custom permission.