Version Control With Subversion Source

Fix issue 136 ("examples for external merge use the wrong argument
order for mine and theirs arguments").

Reported by: tsteven4

* src/en/book/ch07-customizing-svn.xml
Fix argument ordering assumptions in external merge wrapper examples.

* book/ch02-basic-usage.xml: typo fix

Patch by: Patrick Robinson

Finish Issue #130 ("1.6 change: improved interactive conflict
resolution").

* src/en/book/ch02-basic-usage.xml
Update conflict resolution prompts in example output. Document the
mine-conflict, theirs-conflict, and display-conflicts options.

* src/en/book/ch04-branching-and-merging.xml
Update conflict resolution prompts in example output.

* src/en/book/ch09-reference.xml
Update conflict resolution prompts in example output.

Finish issue #49 ("ch09: missing svnversion example showing output for
a partial/sparse checkout").

* src/en/book/ch09-reference.xml
(svn.ref.svnversion.re.examples): Document the 'P' code which
svnversion uses.

* src/en/book/ch06-server-configuration.xml
Oops! Add some words that didn't make it from my head to my text
editor.

Reported by: Quinn Taylor <quinntaylor@...>

Finish issue #42 ("ch02: Minor technical inconsistency in describing
conflicted files").

* src/en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.pending): Rework the description of the
conflict file names to more accurately and generally describe their
functions.

Finish issue #98 ("ch06: How to find whether your client/server does SASL").

* src/en/book/ch06-server-configuration.xml
Note that 'svn --version' will report the availability of Cyrus SASL.

Finish issue #103 ("Move detailed information about external merge
tool configuration from Chapter 2 to Chapter 7").

* src/en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Drop specifics (and wrong ones, at
that) of the external editor configuration in favor of a pointer
the pre-existing section which covers that topic. Also, drop
specifics of the external merge tool configuration in favor of a
pointer to...

* src/en/book/ch07-customizing-svn.xml
(svn.advanced.externaldifftools.merge): ...this new section.
(svn.advanced.externaldifftools, svn.advanced.externaldifftools.diff3):
Weave some more general information about the external merge tool
-- and how it differs from the diff3 tool -- into these text, and
try to consistently refer to the diff3 tool as a "three-way
differencing" tool rather than a "merge" tool.

* src/en/book/ch03-advanced-topics.xml
Oops! Restore an AWOL angle bracket.

Finish issue #107 ("ch03: Revision specifiers may require quotes").

* src/en/book/ch03-advanced-topics.xml
(svn.tour.revs.dates): Use an admonishment block to point our the
need to escape or quote whitespace and, in some cases, curly
braces used in revision date specifiers.