Version Control With Subversion Source

* src/en/book/ch02-basic-usage.xml
Avoid redundant descriptions of common 'svn status' codes.

Markup corrections only.

* src/en/book/appb-svn-for-cvs-users.xml
Lose redundant (and ill-marked-up) information.

Minor typo fix.

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.