Merge pull request #3650 from arturts/patch-5
authorCheng Zhao <zcbenz@gmail.com>
Wed, 2 Dec 2015 02:21:10 +0000 (10:21 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Wed, 2 Dec 2015 02:21:10 +0000 (10:21 +0800)
:memo: [ci skip] Update to match english docs, fix typos


Trivial merge