[zh] Synchronize with en version

Some lines are modified in chapter 4.
The modifications refer to the commit 39663b43.
(gitolite section reworked for gitolite v3)
Merge pull request #680 from YueLinHo/master

[zh] Synchronize with en version