i18n: merged to [885] in trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@886 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 13 insertions, 0 deletions

diff --git a/docs/middleware.txt b/docs/middleware.txt
index dfa1947bbd..33cb1a38e4 100644
--- a/docs/middleware.txt
+++ b/docs/middleware.txt
@@ -168,6 +168,19 @@ object returned by a Django view.
 the given ``response``, or it could create and return a brand-new
 ``HttpResponse``.
 
+process_exception
+-----------------
+
+Interface: ``process_exception(self, request, exception)``
+
+``request`` is an ``HttpRequest`` object. ``exception`` is an ``Exception``
+object raised by the view function.
+
+Django calls ``process_exception()`` when a view raises an exception.
+``process_exception()`` should return either ``None`` or an ``HttpResponse``
+object. If it returns an ``HttpResponse`` object, the response will be returned
+to the browser. Otherwise, default exception handling kicks in.
+
 Guidelines
 ----------