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.
[fr] Follow #1237

Updated isOwnedBy function to check if not false
Update models.rst
Merge pull request #1279 from alanfgh/patch-15

Update models.rst
Remove versionchanged notice from 1.x
Merge pull request #1281 from cakephp/master-cleanup

Remove versionchanged notice from 1.x
Remove deprecated method.

No point in keeping pointless deprecated methods in the book.

Fixes #1272
[ja] Follow e9fcb08
[ja] Follow #1281
[ja] Follow #1237
[ja] Follow #1260
Update retrieving-your-data.rst
Merge pull request #1283 from alanfgh/patch-16

Update retrieving-your-data.rst
clear up ambiguity on what to include

today in IRC there was confusion over the SimplePasswordHasher as in the docs the class does not appear to App:uses AppModel, only SimplePasswordHasher. To clarify for those following the tutorial who might not know what is going on, details were added to existing code and the App::uses('AppModel', 'Model') line was added.
re-ordered and removed detailed comment
added space after , per cake coding standards
Merge pull request #1284 from cwbit/patch-1

clear up ambiguity on what to include
Update info regarding layout key setting in email config.