doc block corrections
casing
Merge pull request #3265 from dereuromark/3.0-mixed

3.0 mixed