Version Control With Subversion Source

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Let's tell that `m` (merge)
command is the main way to resolve conflicts interactively. Added
<screen> of the internal merge tool, too.

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.diff): Update other <screen> outputs for
`svn update` with conflicts to match SVN 1.8.

[fr] Chapter 3 : work in progress

[fr] Chapter 5 : work in progress.

[fr] Chapter 5: translation of first half for version 1.8

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.diff): Update <screen> output to match
SVN 1.8.

Issue #266. Discovered during the read-thru process.

* en/book/ch02-basic-usage.xml.
(svn.tour.cycle.resolve): Update <screen> output to match the one
SVN 1.8 produces and add new new (m) option to the list.

Read-thru of SVNBook 1.8.

* en/book/ch02-basic-usage.xml.
(svn.tour.cycle.edit): It seems that it would be great to provide a
link to (svn.advanced.working-without-a-wc) here.

Read-thru of SVNBook 1.8.

* en/book/ch02-basic-usage.xml.
(svn.tour.cycle.update): Changed "checked in" to "committed".
HACKING tells that we commit, we don't check in.

Read-thru of SVNBook 1.8.

* en/book/ch02-basic-usage.xml.
(svn.tour.help): Updated `svn help` screen to be consistent with
Subversion 1.8.