diff options
| author | Tom Christie | 2014-11-07 10:14:03 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-11-07 10:14:03 +0000 |
| commit | 555930ee81c21f02fb7f44119a0a35dc4f7c048a (patch) | |
| tree | f1107b56abdc8a4e0698e2eff231ef501a520065 /docs/api-guide/settings.md | |
| parent | 9b19b5a59485c9dad4a18538a8a86f1ae4ea2a55 (diff) | |
| parent | 9078fd4f689717aef7feecde7e7692d87050c611 (diff) | |
| download | django-rest-framework-555930ee81c21f02fb7f44119a0a35dc4f7c048a.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs/api-guide/settings.md')
| -rw-r--r-- | docs/api-guide/settings.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 2144a2ed..48af30a5 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -154,13 +154,13 @@ Default: `None` ### SEARCH_PARAM -The name of a query paramater, which can be used to specify the search term used by `SearchFilter`. +The name of a query parameter, which can be used to specify the search term used by `SearchFilter`. Default: `search` #### ORDERING_PARAM -The name of a query paramater, which can be used to specify the ordering of results returned by `OrderingFilter`. +The name of a query parameter, which can be used to specify the ordering of results returned by `OrderingFilter`. Default: `ordering` @@ -321,7 +321,7 @@ When set to `False`, JSON responses will escape non-ascii characters, like so: {"unicode black star":"\u2605"} -Both styles conform to [RFC 4627][rfc4627], and are syntactically valid JSON. The unicode style is prefered as being more user-friendly when inspecting API responses. +Both styles conform to [RFC 4627][rfc4627], and are syntactically valid JSON. The unicode style is preferred as being more user-friendly when inspecting API responses. Default: `True` |