Merge latest changes from master.

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