From 204253ed40dc6f56d666e5fb2568de1535c18fc3 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 17 Nov 2010 20:03:15 +0000 Subject: [PATCH] Fixed #14713 -- documented that resolve can raise Http404. Thanks to Adam for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14603 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/topics/http/urls.txt | 3 +++ docs/topics/http/views.txt | 2 ++ 2 files changed, 5 insertions(+) diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt index 6179c3003e..00ee483457 100644 --- a/docs/topics/http/urls.txt +++ b/docs/topics/http/urls.txt @@ -837,6 +837,9 @@ worry about the ``urlconf`` parameter. The function returns a :class:`django.core.urlresolvers.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. + .. class:: ResolverMatch() .. attribute:: ResolverMatch.func diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt index 399e6b6ad1..3ff11da1e9 100644 --- a/docs/topics/http/views.txt +++ b/docs/topics/http/views.txt @@ -95,6 +95,8 @@ to handle those errors. The Http404 exception --------------------- +.. class:: django.http.Http404() + When you return an error such as ``HttpResponseNotFound``, you're responsible for defining the HTML of the resulting error page::