Merge pull request #892 from github/feature/update-user-manual-for-2.…

Merge pull request #892 from github/feature/update-user-manual-for-2.… #3566