Merge pull request #3824 from jim-parry/fix/docs

[ci skip] Fix typos in user guide