cakephp/docs — pull request #981 by okonomi (2014-01-02 05:01:27+00:00)
Title: Fixed rst syntax

- `:php:method` to `:php:meth`
- fixed error `SEVERE: Duplicate ID: "namespace-Cake\Cache”.`
- delete conflict mark