minor updates to user guide
Merge branch 'master' into 2107-radhika-user-guide-minor-updates

Conflicts:
	doc/_config.yml
Fix Task#2268 by removing the extra space character
Merge branch '2107-radhika-user-guide-minor-updates'