Convert prefix directives to new syntax.

[cworth.org] / src / hgbook-git / tour.mdwn

diff --git a/src/hgbook-git/tour.mdwn b/src/hgbook-git/tour.mdwn
index 75263697dba3c3c9862bb523c02c9c539c2937fe..5c3a3234b973152b3d2a3807b14e4bf45ddb2188 100644 (file)
--- a/src/hgbook-git/tour.mdwn
+++ b/src/hgbook-git/tour.mdwn
@@ -1,4 +1,4 @@
-[[meta title="A tour of git: the basics"]]
+[[!meta title="A tour of git: the basics"]]
 A tour of git: the basics
 
 ### 2.0 Copyright
@@ -822,6 +822,16 @@ that tell me something that I can’t figure out with a quick glance at
 the output of "git log --stat" or “git log -p", (so repeating the list
 of all modified files is not useful, for example).
 
+To follow along with the example here, go ahead and type something
+like the following sentence into the editor. The misspelling here is
+intentional. You'll see how to fix that up after the fact in just a
+moment:
+
+       Fixed the typo so the program actuall complies now.
+
+Then save the file, and exit from the editor. When you do that, git
+will create the commit.
+
 #### 2.7.4 Aborting a commit
 
 If you decide that you don’t want to commit while in the middle of
@@ -869,13 +879,13 @@ identifier shown above. Can you do it?)
 So now that we've cloned a local repository, made a change to the
 code, setup our name and email address, and made a careful commit,
 we're just about ready to share our change with the world. But wait,
-that commit message has some really embarrassing misspellings in
-it. Wouldn't it be nice to touch those up before I post this commit
+that commit message has that embarrassing misspelling in
+it. Wouldn't it be nice to touch that up before we post this commit
 with a never-to-be-changed again commit identifier?
 
 This is the exact situation for which "git commit --amend" was
-invented. So I can just run that now and fix the broken commit
-message:
+invented. So you can just run that now and fix the broken commit
+message in the editor:
 
        $ git commit --amend
 
@@ -935,9 +945,8 @@ helpful when the commit it isolates is as small as possible.
 
 One advantage of using git over some other systems is that the commit
 speed is blazingly fast. The tool doesn't punish you at all for
-committing as often as you get our project into a state that is worth
-saving. "Commit early, commit often" is a well-supported mode of
-operation with git.
+committing every time your project is in a state worth saving. "Commit
+early, commit often" is a well-supported mode of operation with git.
 
 ### 2.8 Sharing changes
 
@@ -1058,7 +1067,7 @@ Another helpful way of visualizing what happened with "git fetch" here
 is to run "gitk --all", which gives a graphical representation of all
 branches. Here is what it would look like:
 
-[[img gitk-fetch.png]]
+[[!img gitk-fetch.png]]
 
 Notice that origin/master points to a single commit that was committed
 on top of the state pointed to by the "master" branch.