Merge branch 'jm/doc-wording-tweaks' into maint