From 10e3c9f1e0d4754a5fdeaa7ac8e03d8db53b29d6 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sun, 13 Sep 2009 04:54:48 +0000 Subject: [PATCH] [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 --- docs/topics/http/shortcuts.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/http/shortcuts.txt b/docs/topics/http/shortcuts.txt index 2bc35a3b9f..e8039fe253 100644 --- a/docs/topics/http/shortcuts.txt +++ b/docs/topics/http/shortcuts.txt @@ -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