Port a few markup edits from 3.x
1 file changed