aboutsummaryrefslogtreecommitdiffstats
path: root/docs/api-guide/throttling.md
diff options
context:
space:
mode:
authorMark Aaron Shirley2013-05-08 22:39:48 -0700
committerMark Aaron Shirley2013-05-08 22:39:48 -0700
commite550740b3d07e9f89e89941ee6be1101c7770e9a (patch)
tree7e26d3e76479f16302e2fade1890c35fe3c1b445 /docs/api-guide/throttling.md
parent7e0a93f0eefead25f0e9b6615675f394af3a4ba0 (diff)
parent4ab7b8f257f9d3a1b35d34d0f90f0103b0cc6369 (diff)
downloaddjango-rest-framework-e550740b3d07e9f89e89941ee6be1101c7770e9a.tar.bz2
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Conflicts: rest_framework/tests/relations_nested.py
Diffstat (limited to 'docs/api-guide/throttling.md')
-rw-r--r--docs/api-guide/throttling.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md
index 1abd49f4..d6de85ba 100644
--- a/docs/api-guide/throttling.md
+++ b/docs/api-guide/throttling.md
@@ -40,7 +40,8 @@ The default throttling policy may be set globally, using the `DEFAULT_THROTTLE_C
The rate descriptions used in `DEFAULT_THROTTLE_RATES` may include `second`, `minute`, `hour` or `day` as the throttle period.
-You can also set the throttling policy on a per-view basis, using the `APIView` class based views.
+You can also set the throttling policy on a per-view or per-viewset basis,
+using the `APIView` class based views.
class ExampleView(APIView):
throttle_classes = (UserThrottle,)
@@ -167,4 +168,4 @@ The following is an example of a rate throttle, that will randomly throttle 1 in
[cite]: https://dev.twitter.com/docs/error-codes-responses
[permissions]: permissions.md
[cache-setting]: https://docs.djangoproject.com/en/dev/ref/settings/#caches
-[cache-docs]: https://docs.djangoproject.com/en/dev/topics/cache/#setting-up-the-cache \ No newline at end of file
+[cache-docs]: https://docs.djangoproject.com/en/dev/topics/cache/#setting-up-the-cache