Merge in marko's doc markup

1 files changed, 3 insertions, 3 deletions

diff --git a/djangorestframework/permissions.py b/djangorestframework/permissions.py
index ae550f25..3831424f 100644
--- a/djangorestframework/permissions.py
+++ b/djangorestframework/permissions.py
@@ -36,7 +36,7 @@ class BasePermission(object):
     
     def check_permission(self, auth):
         """
-        Should simply return, or raise an ErrorResponse.
+        Should simply return, or raise an :class:`response.ErrorResponse`.
         """
         pass
 
@@ -60,7 +60,7 @@ class IsAuthenticated(BasePermission):
             raise _403_FORBIDDEN_RESPONSE 
 
 
-class IsAdminUser():
+class IsAdminUser(BasePermission):
     """
     Allows access only to admin users.
     """
@@ -86,7 +86,7 @@ class PerUserThrottling(BasePermission):
     """
     Rate throttling of requests on a per-user basis.
 
-    The rate is set by a 'throttle' attribute on the ``View`` class.
+    The rate (requests / seconds) is set by a :attr:`throttle` attribute on the ``View`` class.
     The attribute is a two tuple of the form (number of requests, duration in seconds).
 
     The user id will be used as a unique identifier if the user is authenticated.