合并rover12421对第四章的校稿, commit at 0c1ef45