From 1dd061ad7705d2851bee5e78b9fed381130ec5f4 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 5 Sep 2013 08:43:10 -0400
Subject: [PATCH] [1.6.x] Fixed #21044 -- Documented
 django.core.urlresolvers.Resolver404

Thanks Keryn Knight for the suggestion.

Backport of eacf060e01 from master
---
 docs/ref/exceptions.txt   | 9 +++++++++
 docs/ref/urlresolvers.txt | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/ref/exceptions.txt b/docs/ref/exceptions.txt
index bee8559ab0..956ee5a188 100644
--- a/docs/ref/exceptions.txt
+++ b/docs/ref/exceptions.txt
@@ -131,6 +131,15 @@ URL Resolver exceptions
 
 URL Resolver exceptions are defined in :mod:`django.core.urlresolvers`.
 
+Resolver404
+--------------
+.. exception:: Resolver404
+
+    The :exc:`Resolver404` exception is raised by
+    :func:`django.core.urlresolvers.resolve()` if the path passed to
+    ``resolve()`` doesn't map to a view. It's a subclass of
+    :class:`django.http.Http404`
+
 NoReverseMatch
 --------------
 .. exception:: NoReverseMatch
diff --git a/docs/ref/urlresolvers.txt b/docs/ref/urlresolvers.txt
index 87c0605a11..32b3ce6fc8 100644
--- a/docs/ref/urlresolvers.txt
+++ b/docs/ref/urlresolvers.txt
@@ -102,8 +102,9 @@ worry about the ``urlconf`` parameter. The function returns a
 :class:`ResolverMatch` object that allows you
 to access various meta-data about the resolved URL.
 
-If the URL does not resolve, the function raises an
-:class:`~django.http.Http404` exception.
+If the URL does not resolve, the function raises a
+:exc:`~django.core.urlresolvers.Resolver404` exception (a subclass of
+:class:`~django.http.Http404`) .
 
 .. class:: ResolverMatch