Merge branch 'tristan/user-guide-refactor' into 'master'

User guide enhancements

See merge request BuildStream/buildstream!1864