summaryrefslogtreecommitdiff
path: root/docs/intro
diff options
context:
space:
mode:
authorMarc Garcia <garcia.marc@gmail.com>2009-08-04 14:56:04 +0000
committerMarc Garcia <garcia.marc@gmail.com>2009-08-04 14:56:04 +0000
commit986bcffed2c2ab85a1cd3ebe520b7d725d921846 (patch)
treecc0e9029a066d8fde65d0626a7edf7be551ae40d /docs/intro
parentd05ad1420afb5c284c1d1e1669d40af69eeb4538 (diff)
[soc2009/i18n] merged up to trunk r11385
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/i18n-improvements@11388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/intro')
-rw-r--r--docs/intro/tutorial03.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index f4ef5f76fe..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
@@ -365,7 +365,7 @@ That takes care of setting ``handler404`` in the current module. As you can see
in ``django/conf/urls/defaults.py``, ``handler404`` is set to
:func:`django.views.defaults.page_not_found` by default.
-Three more things to note about 404 views:
+Four more things to note about 404 views:
* If :setting:`DEBUG` is set to ``True`` (in your settings module) then your
404 view will never be used (and thus the ``404.html`` template will never