Surround ^/ in main body with <literal></literal>
Fix a typo in chapter 6
1.8/zh: translation of chapter 6 in progress
fixed markup of hook names
fixed validation errors
applied trunk merges to en 1.7
sync with en version r5736 (invisible change)
