From 45535c8a4cba200cd610010ec1e2d515de6c2475 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Tue, 1 Oct 2013 10:08:36 -0400
Subject: [PATCH] [1.5.x] Fixed #21834 -- Clarifed usage of template_name in
 tutorial part 4.

Backport of a292ad1105 from stable/1.6.x
---
 docs/intro/tutorial04.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt
index 05672c2852..ee0f0ad040 100644
--- a/docs/intro/tutorial04.txt
+++ b/docs/intro/tutorial04.txt
@@ -267,7 +267,7 @@ two views abstract the concepts of "display a list of objects" and
 
 By default, the :class:`~django.views.generic.detail.DetailView` generic
 view uses a template called ``<app name>/<model name>_detail.html``.
-In our case, it'll use the template ``"polls/poll_detail.html"``. The
+In our case, it would use the template ``"polls/poll_detail.html"``. The
 ``template_name`` attribute is used to tell Django to use a specific
 template name instead of the autogenerated default template name. We
 also specify the ``template_name`` for the ``results`` list view --