lots of updates to the user guide
Merge branch 'master' of github.com:gdha/upgrade-ux