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

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