Edits to the User Guide

Minor edits to user-guide files.

Change-Id: I7f2cb4ce34739c41fcda38c4c02f12deb1f816a3
Merge "Edits to the User Guide"