Small updates in 17

Author: hjwp

chapter_11_ansible.asciidoc

@@ -1330,14 +1330,14 @@ time, and the `migrate` seems to have worked too.
 
 
 
-Git Tag the Release
-~~~~~~~~~~~~~~~~~~~
+=== Git Tag the Release
 
 
-((("Git", "tagging releases")))One
-final bit of admin.  In order to preserve a historical marker,
-we'll use Git tags to mark the state of the codebase that reflects
-what's currently live on the server:
+((("Git", "tagging releases")))
+One final bit of admin.
+In order to preserve a historical marker,
+we'll use Git tags to mark the state of the codebase
+that reflects what's currently live on the server:
 
 [role="skipme"]
 [subs="specialcharacters,quotes"]
@@ -1349,10 +1349,11 @@ $ *git tag $TAG*
 $ *git push origin LIVE $TAG* # pushes the tags up
 ----
 
-Now it's easy, at any time, to check what the difference is between
-our current codebase and what's live on the servers.  This will come
-in useful in a few chapters, when we look at database migrations. Have
-a look at the tag in the history:
+Now it's easy, at any time, to check what the difference is
+between our current codebase and what's live on the servers.
+This will come in useful in a few chapters,
+when we look at database migrations.
+Have a look at the tag in the history:
 
 [subs="specialcharacters,quotes"]
 ----
@@ -1365,7 +1366,10 @@ $ *git log --graph --oneline --decorate*
 // RITA: Perhaps add the note about the reader emailing you when their site goes live to this point. "Tell your mum! Tell me! Email me at....""
 You now have a live website!  Tell all your friends!
 Tell your mum, if no one else is interested!
-And, in the next chapter, it's back to coding again.((("", startref="Fstage11")))
+Or, tell me!  I'm always delighted to see a new reader's site!
+[email protected]
+
+In the next chapter, it's back to coding again.((("", startref="Fstage11")))
 
 // DAVID: maybe more of a conclusion here? It's quite a heavy chapter,
 // a bit of an anticlimax to stop here. I want some inspiring note to end on.

chapter_17_second_deploy.asciidoc

@@ -116,17 +116,23 @@ $ pass:quotes[*ansible-playbook --user=elspeth -i www.ottg.co.uk, infra/ansible-
 
 === What to Do If You See a Database Error
 
-
 Because our migrations introduce a new integrity constraint, you may find
 that it fails to apply because some existing data violates that constraint.
 
+[role="skipme"]
+----
+sqlite3.IntegrityError: columns list_id, text are not unique
+----
+
+
 At this point you have two choices:
 
 1. Delete the database on the server and try again.
   After all, it's only a toy project!
 
 2. Learn about data migrations.  See <<data-migrations-appendix>>.
 
+==== How to Delete the Database on the Staging Server
 
 Here's how you might do option (1):
 
@@ -140,6 +146,9 @@ so we pass in `rm db.sqlite3`.
 We don't need a full path because we keep the sqlite database in elspeth's home folder.
 
 
+TIP: Don't do this in prod!
+
+
 
 === Wrap-Up: git tag the New Release
 
@@ -155,12 +164,13 @@ $ *git tag $TAG*
 $ *git push -f origin LIVE $TAG*
 ----
 
-NOTE: Some people don't like to use `push -f` and update an existing tag, and
-    will instead use some kind of version number to tag their releases.  Use
-    whatever works for you.
+NOTE: Some people don't like to use `push -f` and update an existing tag,
+    and will instead use some kind of version number to tag their releases.
+    Use whatever works for you.
 
-And on that note, we can wrap up <<part2>>, and move on to the more exciting
-topics that comprise <<part3>>.  Can't wait!
+And on that note, we can wrap up <<part2>>,
+and move on to the more exciting topics that comprise <<part3>>.
+Can't wait!
 
 [role="pagebreak-before less_space"]
 .Deployment Procedure Review