Merge branch 'main' into review--chapter-09

Author: Xronophobe

acknowledgments.asciidoc

@@ -109,6 +109,7 @@ Jonathan H,
 James Evans,
 Patrick Cantwell,
 Devin Schumacher,
+Nick Nielsen,
 and to anyone I've missed off this list,
 my sincere apologies, and thank you thank you once again.
 

chapter_09_docker.asciidoc

@@ -287,21 +287,21 @@ But there are solutions to all of these.  In order:
 
 === An Overview of Our Deployment Procedure
 
-Over these three chapters chapters I'm going to go through _a_ deployment procedure.
+Over these three chapters, I'm going to go through _a_ deployment procedure.
 It isn't meant to be the _perfect_ deployment procedure,
 so please don't take it as being best practice,
 or a recommendation--it's meant to be an illustration,
 to show the kinds of issues involved in putting code into production,
 and where testing fits in.
 
 
-**This chapter: containerizing our software**
+**This chapter: Containerizing our software**
 
-* Adapt our FTs so they can run against a container
+* Adapt our FTs so they can run against a container.
 
-* Build a minimal Dockerfile with everything we need to run our site,
+* Build a minimal Dockerfile with everything we need to run our site.
 
-* Learn how to build and run a container on our machine
+* Learn how to build and run a container on our machine.
 
 * Learn how to run our FTs against our container.
 
@@ -311,7 +311,7 @@ and where testing fits in.
 
 
 
-**Next chapter: moving to a production-ready configuration**
+**Next chapter: Moving to a production-ready configuration**
 
 * Gradually, incrementally change the container configuration
   to make it production-ready.
@@ -323,28 +323,26 @@ and where testing fits in.
 // gunicorn, DEBUG=False, secret key, etc
 
 
-**Third chapter: Automated deployment to real servers**
+**Third chapter: Automating deployment to real servers**
 
-* Gradually build up an Ansible playbook to deploy our containers on a real server
+* Gradually build up an Ansible playbook to deploy our containers on a real server.
 
-* Again, use our FTs to check for any problems
+* Again, use our FTs to check for any problems.
 
 * Learn how to SSH in to the server to debug things,
   where to find logs and other useful information.
 
-* We'll use Ansible to build an automated script that can deploy
-  our container to staging
+* Confidently deploy to production once we have a working deployment script for staging.
 
-* Once we have a working deployment script for staging,
-  we can confidently deploy to production.
-// CSANAD:  the last two points were in reverse order
+* Use Ansible to build an automated script that can deploy
+  our container to staging.
 
 
 === As Always, Start with a Test
 
 ((("environment variables")))
 Let's adapt our functional tests slightly
-so that it can be run against a standalone server,
+so that they can run against a standalone server,
 instead of the one that `LiveServerTestCase` creates for us.
 We'll do it by checking for an environment variable
 called `TEST_SERVER`: