fix some doc error
Merge branch 'master' into dev