Ticket #1704: tutorial-patch.diff

docs/tutorial01.txt

@@ -449 +449 @@
     >>> p.pub_date = datetime(2005, 4, 1, 0, 0)
     >>> p.save()
 
-    # get_list() displays all the polls in the database.
+    # objects.all() displays all the polls in the database.
     >>> Poll.objects.all()
     [<Poll object>]
 

docs/tutorial03.txt

@@ -360 +360 @@
 
     <h1>{{ poll.question }}</h1>
     <ul>
-    {% for choice in poll.get_choice_list %}
+    {% for choice in poll.choice_set.all %}
         <li>{{ choice.choice }}</li>
     {% endfor %}
     </ul>
@@ -371 +371 @@
 in this case. If attribute lookup had failed, it would've tried calling the
 method ``question()`` on the poll object.
 
-Method-calling happens in the ``{% for %}`` loop: ``poll.get_choice_list`` is
-interpreted as the Python code ``poll.get_choice_list()``, which returns a list
-of Choice objects and is suitable for iteration via the ``{% for %}`` tag.
+Method-calling happens in the ``{% for %}`` loop: ``poll.choice_set.all`` is
+interpreted as the Python code ``poll.choice_set.all()``, which returns an
+iterable of Choice objects and is suitable for use in the ``{% for %}`` tag.
 
 See the `template guide`_ for full details on how templates work.
 

docs/tutorial04.txt

@@ -39 +39 @@
       Django; it's just good Web development practice.
 
 Now, let's create a Django view that handles the submitted data and does
-something with it. Remember, in `Tutorial 3`_, we create a URLconf for the
+something with it. Remember, in `Tutorial 3`_, we created a URLconf for the
 polls application that includes this line::
 
     (r'^(?P<poll_id>\d+)/vote/$', 'mysite.polls.views.vote'),
@@ -151 +151 @@
 
     You should know basic math before you start using a calculator.
 
-First, open the polls.py URLconf. It looks like this, according to the tutorial
-so far::
+First, open the polls/urls.py URLconf. It looks like this, according to the
+tutorial so far::
 
     from django.conf.urls.defaults import *
 
@@ -175 +175 @@
     urlpatterns = patterns('',
         (r'^$', 'django.views.generic.list_detail.object_list', info_dict),
         (r'^(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', info_dict),
-        (r'^(?P<object_id>\d+)/results/$', 'django.views.generic.list_detail.object_detail', dict(info_dict, template_name='polls/results')),
+        (r'^(?P<object_id>\d+)/results/$', 'django.views.generic.list_detail.object_detail', dict(info_dict, template_name='polls/results.html')),
         (r'^(?P<poll_id>\d+)/vote/$', 'mysite.polls.views.vote'),
     )
 
@@ -203 +203 @@
 
 Because we have more than one entry in the URLconf that uses ``object_detail``
 for the polls app, we manually specify a template name for the results view:
-``template_name='polls/results'``. Otherwise, both views would use the same
+``template_name='polls/results.html'``. Otherwise, both views would use the same
 template. Note that we use ``dict()`` to return an altered dictionary in place.
 
 In previous versions of the tutorial, the templates have been provided with a context