summaryrefslogtreecommitdiff
path: root/docs/intro/tutorial03.txt
diff options
context:
space:
mode:
authorKevin Kubasik <kevin@kubasik.net>2009-08-04 09:30:09 +0000
committerKevin Kubasik <kevin@kubasik.net>2009-08-04 09:30:09 +0000
commite2d14c075a51eb1f0b832765df8723d82f0afac4 (patch)
treeca4e9e95cb45d9275f6272b8ca1bab7f06e5eeff /docs/intro/tutorial03.txt
parentf0a864b482cb3aad69424e33a7e259ddb831ea5f (diff)
parentcb5e5dc2bc232905c03deea6bc453a2e9a2338f1 (diff)
[gsoc2009-testing] Massive merge update to trunk. This is in preparation for the release of a sample app and tests
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/test-improvements@11385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/intro/tutorial03.txt')
-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 687407a284..238dc63f71 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