1.8/zh: translation of chapter 6 in progress
Merge from ^/trunk/en r5684.
Rework an awkward paragraph