Ticket #11959: 11959_r11594.diff

docs/intro/tutorial02.txt

@@ -35 +35 @@
       to :setting:`INSTALLED_APPS`, the database tables need to be updated.
 
     * Edit your ``mysite/urls.py`` file and uncomment the lines below the
-      "Uncomment the next two lines..." comment. This file is a URLconf;
-      we'll dig into URLconfs in the next tutorial. For now, all you need to
-      know is that it maps URL roots to applications. In the end, you should
-      have a ``urls.py`` file that looks like this:
+      "Uncomment the next... to enable the admin" comments. This file is a
+      URLconf; we'll dig into URLconfs in the next tutorial. For now, all you
+      need to know is that it maps URL roots to applications. In the end, you
+      should have a ``urls.py`` file that looks like this:
 
     .. versionchanged:: 1.1
         The method for adding admin urls has changed in Django 1.1.

docs/intro/tutorial03.txt

@@ -181 +181 @@
 Take a look in your browser, at "/polls/34/". It'll display whatever ID you
 provide in the URL.
 
+Go ahead and copy that detail view twice and make similar placeholder
+views named ``vote`` and ``results``. If you have URL patterns that
+refer to nonexistent views, various other parts of Django (such as the
+admin interface) won't work properly.
+
 Write views that actually do something
 ======================================
 
@@ -467 +472 @@
 ``mysite/urls.py`` to remove the poll-specific URLs and insert an
 :func:`~django.conf.urls.defaults.include`::
 
-    ...
+    #...
     urlpatterns = patterns('',
         (r'^polls/', include('mysite.polls.urls')),
-        ...
+        #...
+    )
 
 :func:`~django.conf.urls.defaults.include`, simply, references another URLconf.
 Note that the regular expression doesn't have a ``$`` (end-of-string match

docs/intro/tutorial04.txt

@@ -52 +52 @@
 
     (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
 
-So let's create a ``vote()`` function in ``mysite/polls/views.py``::
+So let's modify our placeholder ``vote()`` function in
+``mysite/polls/views.py`` to look like this::
 
     from django.shortcuts import get_object_or_404, render_to_response
     from django.http import HttpResponseRedirect