Consolidate doc block headings.
Merge pull request #5022 from dereuromark/3.0-docblocks

Consolidate doc block headings.