Fix man page sections.

Also fix some mixed indentation.
Merge remote-tracking branch 'origin/pr/667'