Merge "minor tweaks to documentation guide"