更新内容至6.5小节
Merge branch 'master' into gh-pages