Moar misc rST fixes
Merge pull request #12783 from whiteinge/moar-rst-fixes

Moar misc rST fixes