Version Control With Subversion Source

Merge from /trunk/en r5043:

[tickets:#231] Consistently use MERGE when describing custom merge tools

* en/book/ch07-customizing-svn.xml
(svn.advanced.externaldifftools.merge): Fix example merge tool
wrapper scripts to refer to the variable MERGE (rather than
DIFF3).

Patch by: James McCoy <jamessan{__AT__}users.sf.net>

Fix a copy-and-pasto.

[tickets:#231] Consistently use MERGE when describing custom merge tools

* en/book/ch07-customizing-svn.xml
(svn.advanced.externaldifftools.merge): Fix example merge tool
wrapper scripts to refer to the variable MERGE (rather than
DIFF3).

Patch by: James McCoy <jamessan{__AT__}users.sf.net>

Merge from /trunk/en r5041:

[tickets:#230] Errant URL in svn relocate example in subcommand reference

* en/book/ref-svn.xml
(svn.ref.svn.c.relocate): Fix URL in relocate-to-SSL example (to
actually have 'https' ... duh).

Reported by: Jose A. Nunez <taino19xx{__AT__}users.sf.net>

[tickets:#230] Errant URL in svn relocate example in subcommand reference

* en/book/ref-svn.xml
(svn.ref.svn.c.relocate): Fix URL in relocate-to-SSL example (to
actually have 'https' ... duh).

Reported by: Jose A. Nunez <taino19xx{__AT__}users.sf.net>

stylistic changes

Rewrap some more lines.

Remove unnecessary line break.

Remove some blank lines.

Fix indentation

Typo fixes.