Merge branch 'exception-handler-context' of git://github.com/jpadilla/django-rest-framework into version-3.1

2 files changed, 3 insertions, 3 deletions

diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md
index 467ad970..31a8431b 100644
--- a/docs/api-guide/exceptions.md
+++ b/docs/api-guide/exceptions.md
@@ -51,10 +51,10 @@ In order to alter the style of the response, you could write the following custo
 
     from rest_framework.views import exception_handler
 
-    def custom_exception_handler(exc):
+    def custom_exception_handler(exc, context):
         # Call REST framework's default exception handler first,
         # to get the standard error response.
-        response = exception_handler(exc)
+        response = exception_handler(exc, context)
 
         # Now add the HTTP status code to the response.
         if response is not None:
diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md
index 623d89fb..9efeda7f 100644
--- a/docs/api-guide/settings.md
+++ b/docs/api-guide/settings.md
@@ -393,7 +393,7 @@ This setting can be changed to support error responses other than the default `{
 
 This should be a function with the following signature:
 
-    exception_handler(exc)
+    exception_handler(exc, context)
 
 * `exc`: The exception.