Author: russellm
Date: 2009-09-12 23:54:48 -0500 (Sat, 12 Sep 2009)
New Revision: 11553

Modified:
   django/branches/releases/1.1.X/docs/topics/http/shortcuts.txt
Log:
[1.1.X] Fixed #11589 -- Corrected an argument in the shortcuts documentation. 
Thanks to tsaylor for the report.

Merge of r11531 and r11532 from trunk.

Modified: django/branches/releases/1.1.X/docs/topics/http/shortcuts.txt
===================================================================
--- django/branches/releases/1.1.X/docs/topics/http/shortcuts.txt       
2009-09-13 04:40:17 UTC (rev 11552)
+++ django/branches/releases/1.1.X/docs/topics/http/shortcuts.txt       
2009-09-13 04:54:48 UTC (rev 11553)
@@ -147,7 +147,7 @@
 ``get_object_or_404``
 =====================
 
-.. function:: get_object_or_404(object, *args, **kwargs)
+.. function:: get_object_or_404(klass, *args, **kwargs)
 
    Calls :meth:`~django.db.models.QuerySet.get()` on a given model manager,
    but it raises ``django.http.Http404`` instead of the model's


--~--~---------~--~----~------------~-------~--~----~
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