Merge pull request #119 from bhagerty/chapter-7

Chapter 7 - small revision for accuracy

Author: hjwp

chapter_post_and_database.asciidoc

@@ -1545,15 +1545,17 @@ worse:
 
 Grrr.  We're so close! We're going to need some kind of automated way of
 tidying up after ourselves. For now, if you feel like it, you can do it
-manually, by deleting the database and re-creating it fresh with `migrate`:
+manually, by deleting the database and re-creating it fresh with `migrate`
+(you'll need to shut down your Django server first):
 
 [subs="specialcharacters,quotes"]
 ----
 $ *rm db.sqlite3*
 $ *python manage.py migrate --noinput*
 ----
 
-And then reassure yourself that the FT still passes.
+And then (after restarting your server!) reassure yourself that the FT still 
+passes.
 
 Apart from that little bug in our functional testing, we've got some code
 that's more or less working.  Let's do a commit.((("", startref="DTproduction05")))  

chapter_unit_test_first_view.asciidoc

@@ -488,8 +488,11 @@ NOTE: If you've never come across regular expressions, you can get away with
     just taking my word for it, for now--but you should make a mental note to
     go learn about them.
 
-We'll also get rid of the admin URL, because we won't be using the Django
-admin site for now:
+We'll make a couple of changes to what we import and to what we test. First, 
+we don't need to import the `admin` module from `django.contrib`, but we do
+need to import the `views` module from `lists`. Second, we'll rewrite the
+URL pattern to use the empty-string expression instead of the `admin` URL,
+since we won't be using the Django admin site for now:
 
 
 [role="sourcecode dofirst-ch03l003"]
@@ -597,7 +600,7 @@ with HTML to the browser. Open up 'lists/tests.py', and add a new
 ----
 from django.urls import resolve
 from django.test import TestCase
-from django.http import HttpRequest
+from django.http import HttpRequest #<1>
 
 from lists.views import home_page
 
@@ -621,12 +624,13 @@ class HomePageTest(TestCase):
 
 What's going on in this new test?  
 
-<1> We create an `HttpRequest` object, which is what Django will see when
-    a user's browser asks for a page.
+<1> We import the `HttpRequest` class so that we can then create an 
+    `HttpRequest` object within our test. When a user's browser asks for a
+    page, Django will see that object.
 
-<2> We pass it to our `home_page` view, which gives us a response. You won't be
-    surprised to hear that this object is an instance of a class called
-    `HttpResponse`.
+<2> We pass the `HttpRequest` object to our `home_page` view, which gives us a 
+    response. You won't be surprised to hear that the response is an instance 
+    of a class called `HttpResponse`.
 
 <3> Then, we extract the `.content` of the response.  These are the raw bytes,
     the ones and zeros that would be sent down the wire to the user's browser.

chapter_working_incrementally.asciidoc

@@ -717,7 +717,7 @@ class ListViewTest(TestCase):
 ====
 
 
-`assertTemplateUsed` is one of the more useful functions that the Django Test
+`assertTemplateUsed` is one of the more useful methods that the Django Test
 Client gives us.  Let's see what it says:
 
 ----