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 2-5-migration-guide.rst

Added description on how to assign a title now $title_for_layout is deprecated
Merge pull request #1287 from alex-m/patch-1

Update 2-5-migration-guide.rst
Update access-control-lists.rst; fix #1289
Merge pull request #1290 from alanfgh/patch-17

Update access-control-lists.rst; Fixes #1289
Update html.rst

Added demonstration of using routing in addCrumb
Update 2-5-migration-guide.rst

$this->assign('title', 'page title'); was being split across two lines in the documentation, updated to display on single line.
Merge pull request #1293 from alex-m/patch-2

Update 2-5-migration-guide.rst
Update html.rst
Corrected some orthografic mistakes
Merge pull request #1298 from lapin-b/patch-1

Corrected some orthografic mistakes
Update hash.rst

add example to map
[ja] Follow #1284
[fr] Follow #1279

Update models.rst
[fr] Follow #1281

Remove versionchanged notice from 1.x
Merge pull request #1292 from alex-m/patch-1

Update html.rst
[fr] Follow e9fcb086cdbe3744e518bcc2876445d5ad2dd7f0

Remove deprecated method.
[fr] Follow #1283

Update retrieving-your-data.rst