Correct doc blocks
Merge pull request #3247 from cakephp/master-docblocks

Correct doc blocks