Author: Alex
Date: 2010-11-17 14:04:49 -0600 (Wed, 17 Nov 2010)
New Revision: 14604

Modified:
   django/branches/releases/1.2.X/docs/topics/http/urls.txt
   django/branches/releases/1.2.X/docs/topics/http/views.txt
Log:
[1.2.X] Fixed #14713 -- documented that resolve can raise Http404.  Thanks to 
Adam for the patch. Backport of [14603].

Modified: django/branches/releases/1.2.X/docs/topics/http/urls.txt
===================================================================
--- django/branches/releases/1.2.X/docs/topics/http/urls.txt    2010-11-17 
20:03:15 UTC (rev 14603)
+++ django/branches/releases/1.2.X/docs/topics/http/urls.txt    2010-11-17 
20:04:49 UTC (rev 14604)
@@ -834,6 +834,9 @@
 don't need to worry about the ``urlconf`` parameter. The function returns the
 triple (view function, arguments, keyword arguments).
 
+If the URL does not resolve, the function raises an
+:class:`~django.http.Http404` exception.
+
 For example, it can be used for testing if a view would raise a ``Http404``
 error before redirecting to it::
 

Modified: django/branches/releases/1.2.X/docs/topics/http/views.txt
===================================================================
--- django/branches/releases/1.2.X/docs/topics/http/views.txt   2010-11-17 
20:03:15 UTC (rev 14603)
+++ django/branches/releases/1.2.X/docs/topics/http/views.txt   2010-11-17 
20:04:49 UTC (rev 14604)
@@ -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 django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to