Merge branch 'jm/doc-wording-tweaks'