Merge branch 'ticket15695'

2 files changed, 15 insertions, 1 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
 -------
 
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index b769debb0b..c25858b5a6 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -161,7 +161,7 @@ Django 1.5 also includes several smaller improvements worth noting:
   :func:`~django.contrib.auth.decorators.login_required` documentation.
 
 * Django now provides a mod_wsgi :doc:`auth handler
-  </howto/deployment/wsgi/apache-auth>`
+  </howto/deployment/wsgi/apache-auth>`.
 
 * The :meth:`QuerySet.delete() <django.db.models.query.QuerySet.delete>`
   and :meth:`Model.delete() <django.db.models.Model.delete()>` can now take
@@ -169,6 +169,9 @@ Django 1.5 also includes several smaller improvements worth noting:
   objects fetched into memory. See :meth:`QuerySet.delete()
   <django.db.models.query.QuerySet.delete>` for details.
 
+* An instance of :class:`~django.core.urlresolvers.ResolverMatch` is stored on
+  the request as ``resolver_match``.
+
 Backwards incompatible changes in 1.5
 =====================================