Merge pull request #5071 from tianon/minor-man-formatting-consistency

Fix a few minor man formatting consistency issues