summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-09-05 08:43:10 -0400
committerTim Graham <timograham@gmail.com>2013-09-05 08:45:33 -0400
commiteacf060e01617ea5e910e8f8a5805483cd5c60b0 (patch)
tree549968faf2a4edfb1196eba4cc87342deb07e8f6 /docs
parent7b62b80693d57f4bfd7a2f045bfd5c2f787601f8 (diff)
Fixed #21044 -- Documented django.core.urlresolvers.Resolver404
Thanks Keryn Knight for the suggestion.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/exceptions.txt9
-rw-r--r--docs/ref/urlresolvers.txt5
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