summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2009-07-28 14:41:45 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2009-07-28 14:41:45 +0000
commit892ef07ac70870ab6570071b937c44e6f9eaa836 (patch)
treea46c944e7ba4fbdb4a3d0732a552ed110e209f86
parentca530f27c974894d958540b1655358e2d28b7d4a (diff)
[1.0.X] Fixed #11556 -- Clarified the argument required by get_object_or_404. Thanks to rbonvall for the report.
Merge of r11344 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/intro/tutorial03.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index b4c7f3f8aa..8d9f5c4b0a 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -326,8 +326,8 @@ shortcut. Here's the ``detail()`` view, rewritten::
return render_to_response('polls/detail.html', {'poll': p})
The :func:`~django.shortcuts.get_object_or_404` function takes a Django model
-module as its first argument and an arbitrary number of keyword arguments, which
-it passes to the module's :meth:`~django.db.models.QuerySet.get` function. It
+as its first argument and an arbitrary number of keyword arguments, which it
+passes to the module's :meth:`~django.db.models.QuerySet.get` function. It
raises :exc:`~django.http.Http404` if the object doesn't exist.
.. admonition:: Philosophy