diff options
| author | Tom Christie | 2014-04-29 13:34:58 +0100 |
|---|---|---|
| committer | Tom Christie | 2014-04-29 13:34:58 +0100 |
| commit | 161270da992c13ff093048429d3d139f9bd0fc4e (patch) | |
| tree | 96b970add2f65ee2e2655e017bf59ada837a4bec | |
| parent | 1085b64fecc1b314fbd29da263325a56af2d78fe (diff) | |
| parent | d8cb85ef8fb0a0804d9b2c09d909ad99f69301c8 (diff) | |
| download | django-rest-framework-161270da992c13ff093048429d3d139f9bd0fc4e.tar.bz2 | |
Merge pull request #1553 from laurentbristiel/master
typo
| -rwxr-xr-x | docs/api-guide/generic-views.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index fb927ea8..7d06f246 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -70,7 +70,7 @@ The following attributes control the basic view behavior. **Shortcuts**: -* `model` - This shortcut may be used instead of setting either (or both) of the `queryset`/`serializer_class` attributes, although using the explicit style is generally preferred. If used instead of `serializer_class`, then then `DEFAULT_MODEL_SERIALIZER_CLASS` setting will determine the base serializer class. Note that `model` is only ever used for generating a default queryset or serializer class - the `queryset` and `serializer_class` attributes are always preferred if provided. +* `model` - This shortcut may be used instead of setting either (or both) of the `queryset`/`serializer_class` attributes, although using the explicit style is generally preferred. If used instead of `serializer_class`, then `DEFAULT_MODEL_SERIALIZER_CLASS` setting will determine the base serializer class. Note that `model` is only ever used for generating a default queryset or serializer class - the `queryset` and `serializer_class` attributes are always preferred if provided. **Pagination**: |
