Merge with master

1 files changed, 3 insertions, 3 deletions

diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py
index 6e7a0b72..8fe64248 100644
--- a/rest_framework/throttling.py
+++ b/rest_framework/throttling.py
@@ -16,7 +16,7 @@ class BaseThrottle(object):
 
     def wait(self):
         """
-        Optionally, return a recommeded number of seconds to wait before
+        Optionally, return a recommended number of seconds to wait before
         the next request.
         """
         return None
@@ -60,7 +60,7 @@ class SimpleRateThrottle(BaseThrottle):
         Determine the string representation of the allowed request rate.
         """
         if not getattr(self, 'scope', None):
-            msg = ("You must set either `.scope` or `.rate` for '%s' thottle" %
+            msg = ("You must set either `.scope` or `.rate` for '%s' throttle" %
                    self.__class__.__name__)
             raise exceptions.ConfigurationError(msg)
 
@@ -137,7 +137,7 @@ class AnonRateThrottle(SimpleRateThrottle):
     """
     Limits the rate of API calls that may be made by a anonymous users.
 
-    The IP address of the request will be used as the unqiue cache key.
+    The IP address of the request will be used as the unique cache key.
     """
     scope = 'anon'