Version Control With Subversion Source

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.mergeconflicts): Replace examples
demonstrating merges of the wrong diff, in 1.7 we get tree
conflicts, not skips. Update explanatory text as appropriate.

*** NOTE: This change was reverted in r4173 because it tortured the TOC ***

* en/book/ch09-reference.xml
Add <refmeta> sections with better section titles so that when
linking to a reference section, the anchor text is more like

... for more information, see the "svn status" section of
"Subversion Complete Reference".

instead of merely:

... for more information, see svn status.

While here, sort 'svndumpfilter help' before 'svndumpfilter include'.

* en/book/ch09-reference.xml
Tweak the 'svn add --force' example to not use 'svn add *', which
really kinda opens a second set of problems this section doesn't
attempt to solve.

Chapter 4 final read-through part 1

* en/book/ch04-branching-and-merging.xml

(svn.branchmerge.basicmerging): 'subcommand' not 'command'.
Update language to reflect that 1.7 is the latest and greatest.

(svn.branchmerge.basicmerging.mergetracking): New sidebar on
merge tracking.

(svn.branchemerge.basicmerging.stayinsync): Passive voice fixes.
Minor wording tweak. Mention 'svn patch' in the 'Why Not Use
Patches Instead?' sidebar. Move explanation of
'--allow-mixed-revisions' option to a footnote. Typo fixes.

(svn.branchemerge.basicmerging.reintegrate): Passive voice fix.

(svn.branchmerge.basicmerging.mergeinfo): Wording tweak and typo
fix. Remove a tip that has no relevance in 1.7.

(svn.branchmerge.advanced.advancedsyntax): Rework a confusing
sentence.

(svn.branchmerge.nomergedata): Add a link to a relevant sidebar
and use the term 'mergeinfo' rather than 'merge tracking
information'.

* en/book/ch09-reference.xml
Edits resulting from my read-thru of the svn Options section.

* en/book/ch09-reference.xml
Begin a read-thru of the reference chapter, attempting to clarify
and correct where I can.

* en/book/ch04-branching-and-merging.xml
Passive voice cleanup.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.using): Don't imply that we use the same
ongoing example throughout this chapter, we don't.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.finalword): Rework a little to reflect
the fact that merge tracking isn't new anymore.

* en/book/ch04-branching-and-merging.xml
(svn.branchemerge.basicmerging.stayinsync): Add a tip regarding
1.7's new subtree mergeinfo recording behavior.