Author: Alex
Date: 2010-11-17 14:03:15 -0600 (Wed, 17 Nov 2010)
New Revision: 14603

Modified:
   django/trunk/docs/topics/http/urls.txt
   django/trunk/docs/topics/http/views.txt
Log:
Fixed #14713 -- documented that resolve can raise Http404.  Thanks to Adam for 
the patch.

Modified: django/trunk/docs/topics/http/urls.txt
===================================================================
--- django/trunk/docs/topics/http/urls.txt      2010-11-17 17:00:40 UTC (rev 
14602)
+++ django/trunk/docs/topics/http/urls.txt      2010-11-17 20:03:15 UTC (rev 
14603)
@@ -837,6 +837,9 @@
 :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

Modified: django/trunk/docs/topics/http/views.txt
===================================================================
--- django/trunk/docs/topics/http/views.txt     2010-11-17 17:00:40 UTC (rev 
14602)
+++ django/trunk/docs/topics/http/views.txt     2010-11-17 20:03:15 UTC (rev 
14603)
@@ -95,6 +95,8 @@
 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::
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to