Commit 10e3c9f1 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Fixed #11589 -- Corrected an argument in the shortcuts documentation.... 

[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.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 39c53b4b

docs/topics/http/shortcuts.txt

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ will be returned:: 
``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