Docs for merging parsers.
[fr] Docs for merging parsers
Add docs about merging.
Merge branch '3.0-merge' of github.com:cakephp/docs into 3.0-merge
header fix.
[fr] finalize merge ConsoleOptionParsers
Fix small typos.
Merge pull request #2078 from Cayan/patch-2

Fix small typos.
[fr] update array => ArrayObject for callbacks
[fr] fix small typo in previous commit
[en] update internationalization-and-localization.rst
Merge pull request #2080 from caBBAlainB/patch-27

[en] update internationalization-and-localization.rst
Add info about Table::addAssociations()
Document firstOrFail and collection methods.

Document the new method and the ability to use collection methods on
query objects.

Refs #2079
update addAssociations()
Merge pull request #2081 from cakephp/3.0-add-associations

Add info about Table::addAssociations()
Merge pull request #2082 from cakephp/issue-2079

Document firstOrFail and collection methods.
[fr] updates to follow en version
A mention to FileLog change

Just a mention to new FileLogs default destination
Typo in "files"