Merge branch 'ticket15695'

1 files changed, 11 insertions, 0 deletions

diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index cc2a351d8e..ff929014c0 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -190,6 +190,17 @@ All attributes should be considered read-only, unless stated otherwise below.
     URLconf for the current request, overriding the :setting:`ROOT_URLCONF`
     setting. See :ref:`how-django-processes-a-request` for details.
 
+.. attribute:: HttpRequest.resolver_match
+
+    .. versionadded:: 1.5
+
+    An instance of :class:`~django.core.urlresolvers.ResolverMatch` representing
+    the resolved url. This attribute is only set after url resolving took place,
+    which means it's available in all views but not in middleware methods which
+    are executed before url resolving takes place (like ``process_request``, you
+    can use ``process_view`` instead).
+
+
 Methods
 -------