move demo to near the end

diff --git a/talk.txt b/talk.txt
index c0b2406602b70e927cd33a9beff5bde424cd608e..805abf25d4f0830853cd6133fc82c714148e8650 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -151,16 +151,12 @@ not need to pass any quilt mode option to dgit.  And, you always can
 upload right away.  All necessary bureaucracy is done automatically
 when you say dgit push-source.
 
-OK, that concludes the marketing spiel.  Now we're going to have a
-quick demo.  Sean ?
-
-===== demo
+OK, that concludes the marketing spiel.
+I'm going to give you a bit more detail now about how it works.
+Sean'll be doing a demo later.
 
 ===== data model slide "commit history structure" showing master=2
 
-Now you've seen it in action, I'm going to quickly run through the
-data model and history structure.
-
 There are some important details I'm going to be glossing over, so if
 you actually want to know what's really going on, please read the
 reference documentation in the section 5 manpage, where everything is
@@ -190,21 +186,24 @@ delta queue.  You can git log -G for things, and be told where they
 came from and shown the relevant commit (whether that's upstream, or
 one of yours).
 
-OK then, suppose you make a change like the one Sean made in the demo:
+OK then, suppose you make a change which both edits upstream files,
+and files in the debian directory.  A common example might be
+a change which edits some upstream file but also adds a changelog
+entry.
 
 ===== data model slide "commit history structure" showing master=C3
 
 I'm calling this C3.  The reason for this name will be clear in a
 moment.
 
-Sean's commit edited an upstream file and also debian/changelog.  So
-if you do that, your tree is, of course, still fine: you can build and
-test it right away.
+Now, with this commit your tree is, of course, still fine: you can
+build and test it right away.
 
 But suppose you want to tidy things up, and, in particular, that you
 wanted the new upstream change to actually come before 2.  Maybe it
-just makes more sense there, or maybe you are going to change patch 3
-to make use of it.
+just makes more sense there.  Or, maybe, you are going to change patch
+3 to make use of it, in which case commit 3 really ought to come
+before commit 2.
 
 ===== data model slide with git-debrebase -i overlay 
 
@@ -389,6 +388,12 @@ But, for now, teams should coordinate to avoid creating diverging
 git-debrebase branches.  git-debrebase will help you with that, by
 often spotting when divergence is about to occur and warning you.
 
+OK, that's enough explanation.  Time for the demo.  Sean ?
+
+===== demo
+
+Thanks, Sean.
+
 ===== status and references slide
 
 So: