correct doc blocks
Merge pull request #3126 from dereuromark/3.0-docblocks

correct doc blocks