Version Control With Subversion Source

1.8/zh: translation of chapter 4 in progress

1.8/zh: translation of chapter 4 in progress

fix section title

1.8/zh: translation of chapter 4 in progress

1.8/zh: translation of chapter 4 in progress

1.8/zh: follow-up r5496

1.8/zh: merge trunk changes

Merge from ^/trunk/en r5493.

Merge from ^/trunk/en r5493.

Reword a section title

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.pre1.5clients): Change the section title
to avoid awkward grammatical constructs while still trying to be
both concise and accurate.