Fixed rst syntax

- `:php:method` to `:php:meth`
- fixed error `SEVERE: Duplicate ID: "namespace-Cake\Cache”.`
- delete conflict mark
Merge pull request #981 from okonomi/3.0-rst-syntax-fix

Fixed rst syntax