Ticket #5946: 5946.2.diff

docs/tutorial03.txt

@@ -402 +402 @@
     urlpatterns = patterns('mysite.polls.views',
         (r'^polls/$', 'index'),
         (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
-        (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
-        (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
+        #(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
+        #(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
     )
 
 This is functionally identical to the previous formatting. It's just a bit
 tidier.
 
+Note that we commented out the ``results`` and ``vote`` patterns as, at this stage,
+we still have not written those views and Django would give us errors trying to find
+them.
+
 Decoupling the URLconfs
 =======================
 
@@ -451 +455 @@
     urlpatterns = patterns('mysite.polls.views',
         (r'^$', 'index'),
         (r'^(?P<poll_id>\d+)/$', 'detail'),
-        (r'^(?P<poll_id>\d+)/results/$', 'results'),
-        (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
+        #(r'^(?P<poll_id>\d+)/results/$', 'results'),
+        #(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
     )
 
 The idea behind ``include()`` and URLconf decoupling is to make it easy to

docs/tutorial04.txt

@@ -69 +69 @@
             # user hits the Back button.
             return HttpResponseRedirect(reverse('mysite.polls.views.results', args=(p.id,)))
 
+Remember to uncomment the ``urlpattern`` for ``vote`` that we commented on part
+3 of this tutorial.
+
 This code includes a few things we haven't covered yet in this tutorial:
 
     * ``request.POST`` is a dictionary-like object that lets you access
@@ -120 +123 @@
         p = get_object_or_404(Poll, pk=poll_id)
         return render_to_response('polls/results.html', {'poll': p})
 
+Again, remember to uncomment the ``urlpattern`` for ``results`` that we commented
+on part 3 of this tutorial.
+
 This is almost exactly the same as the ``detail()`` view from `Tutorial 3`_.
 The only difference is the template name. We'll fix this redundancy later.