Version Control With Subversion Source

Fix grammar in chapter 02.

"not just on file-to-file basis" -> "not just on a file-to-file basis"

Fix typo in chapter 2

"confilcts" -> "conflicts"

1.8/zh: translation of chapter 5 in progress

1.8/zh: translation of chapter 5 in progress

[fr] Chapter 5 : fixing typo in a tag.

[fr] Updating diagrams to fit in pdf versions.

[fr] Following English version.
Nothing to do.

1.8/zh: translation of chapter 5 in progress

Modify chapter 2's description of svn status output

After discussion on the mailing list, there is some consensus that
"conflict" is a better word than "overlap" for this sentence.

1.8/zh: translation of chapter 5 in progress