TOOLSDOC-384: User Guide, remainder - tech edits

Apply to master and 4.1.x