1.8/zh: translation of chapter 6 in progress
synced with en version
[fr] Minor updates iot be synced with English version.
article reinserted
removed extraneous article
synced with en r5808
Merge a bunch of relatively recent trunk changes (some of which where not applicable): r5717,5722,5736,5747,5752,5765,5768,5776,5778,5799,5806