[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
This commit is contained in:
Russell Keith-Magee 2009-09-13 04:54:48 +00:00
parent 39c53b4bf3
commit 10e3c9f1e0
1 changed files with 1 additions and 1 deletions

View File

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