Adjust doc blocks according to convention.
Merge pull request #3314 from dereuromark/3.0-standards

3.0 standards around doc blocks