Moved and reworded confusingly placed technically false statement that ACO's contain CRUD perms to section on perms, from the section on ACOs. Also combined to blocks of example code into a logical whole, and reworded related ambiguous justification for using  context of a Controller action in example.
Changed a word back.
Removed a new line.
Update models.rst
Merge pull request #1222 from jalbertocr/master

Fix formatting.
Merge pull request #1211 from alanfgh/patch-11

Update models.rst
Fixed typo
Update cakephp-conventions.rst
Update cakephp-conventions.rst
Merge pull request #1232 from oricis/patch-1

Update cakephp-conventions.rst
Merge pull request #1233 from oricis/patch-2

Update cakephp-conventions.rst
Update cakephp-conventions.rst
Merge pull request #1234 from oricis/patch-3

Update cakephp-conventions.rst
Update request-response.rst
Merge pull request #1235 from alanfgh/patch-10

Update request-response.rst
Updated isOwnedBy function to check if not false

Previous code:
```return $this->field('id', array('id' => $post, 'user_id' => $user)) === $post;
Does not work because $this->field() returns a string value when successful and otherwise returns false. The $post variable is of type int.

If $this->field() returns anything other than bool(false) it must mean it found the post_id, but imho matching it against the searched parameter would be useless and parsing String > int or int > String is not that awesome.. 
Changing === to == would cause posts with id 0 to fail (as 0 == false) therefore I propose the this solution.
[fr] Follow #1211

Update models.rst
[fr] Follow #1235

Update request-response.rst
Update glossary.rst

correction de quelques fautes de frappe
Merge pull request #1240 from velleda/patch-1

Update glossary.rst