Version Control With Subversion Source

* ch04.xml: make the need for "manual merge tracking" clearer and more
explicit. create a new "use cases" section for merging which
demonstrates (a) repeated merging of one branch to another, (b)
undoing a change, (c) resurrecting deleted things.

* ch06.xml: implement a rewording suggestion from Blair.

* REVIEW: remove the suggestion.