aboutsummaryrefslogtreecommitdiffstats
path: root/docs/api-guide
diff options
context:
space:
mode:
authorTom Christie2013-05-20 13:43:49 +0100
committerTom Christie2013-05-20 13:43:49 +0100
commit656a13616d00b38f7674739d6e0e575aa027360d (patch)
tree74c708390ec3cec309ac717ee01b3ff2b83f75ee /docs/api-guide
parentbc8671d7ea11922ed85921f27b61798894261304 (diff)
parent9f455fbc079db5787f1e6b87390694780f1954e8 (diff)
downloaddjango-rest-framework-656a13616d00b38f7674739d6e0e575aa027360d.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs/api-guide')
-rw-r--r--docs/api-guide/filtering.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md
index a710ad7d..8226aa42 100644
--- a/docs/api-guide/filtering.md
+++ b/docs/api-guide/filtering.md
@@ -87,7 +87,7 @@ The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKE
'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.DjangoFilterBackend',)
}
-You can also set the authentication policy on a per-view, or per-viewset basis,
+You can also set the filter backends on a per-view, or per-viewset basis,
using the `GenericAPIView` class based views.
class UserListView(generics.ListAPIView):
@@ -216,7 +216,7 @@ For more details, see the [Django documentation][search-django-admin].
## OrderingFilter
-The `OrderingFilter` class supports simple query parameter controlled ordering of results. To specify the result order, set a query parameter named `'order'` to the required field name. For example:
+The `OrderingFilter` class supports simple query parameter controlled ordering of results. To specify the result order, set a query parameter named `'ordering'` to the required field name. For example:
http://example.com/api/users?ordering=username