Version Control With Subversion Source

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.finalword): Some run-of-the-mill
rewording and a refresh of the best practices list.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.pre1.5clients): Some minor wording
changes and a link to the 'merge tracking' sidebar.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.ancestry): Index the term 'ancestry'.
Add a tip about --ignore-ancestry's effect on merge tracking.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.logblame): Minor wording tweaks and
correct the sampel 'svn log -q output', it should not show
line count.

* en/book/ch02-basic-usage.xml,
* en/book/ch03-advanced-topics.xml,
* en/book/ch04-branching-and-merging.xml,
* en/book/ch05-repository-admin.xml,
* en/book/ch06-server-configuration.xml
Try another approach to fixing links to Reference sections, adding
the text 'in <xref linkend="svn.ref"/>' after each such reference in
the book that points to an ambiguously named piece of the Reference.

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

(svn.branchmerge.nomergedata.impicit.mergeinfo): New id
attribute for the 'Natural History and Implicit Mergeinfo'
sidebar.

(svn.branchmerge.advanced.reintegratetwice): A few minor
wording changes and a link to the 'Natural History and
Implicit Mergeinfo' sidebar when we use the former term.

Indentation fix only.

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.blockchanges): Some minor wording edits.
Don't use rN shorthand in the main text body, say "revision N";
this is more consistent with the rest of the chapter.

Revert r4171, which had the desired effect in contextual links to the
reference chapter, but made the TOC look hilariously silly.

[...]

svnlook—Subversion Repository Examination
svnlook Options
svnlook Subcommands
the svnlook author section of Subversion Complete Reference
the svnlook cat section of Subversion Complete Reference
the svnlook changed section of Subversion Complete Reference
the svnlook date section of Subversion Complete Reference
the svnlook diff section of Subversion Complete Reference

[...]

* 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.