Merge pull request #20285 from moxiegirl/fix-user-guide

Update the userguide to fix user feedback