Round 2 (of 3) of committers-guide changes. Markup fixes and output-significant whitespace changes.
Approved by: jhb