Consolidate doc block lines around chaining.
A few more doc block corrections.
Merge pull request #5162 from cakephp/3.0-cleanup

Consolidate doc block lines around chaining.