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
Refer to "templates" not views
add RecordNotFoundException description
Merge pull request #2048 from cakephp/3.0-merge

Docs for merging parsers.
Merge pull request #2086 from AD7six/3.0-view-to-template

Refer to "templates" not views
Fix use statement.
document the fallbacks method
use the fallbacks method for the SEO example

rather than a not-particularly-recommendable */*/* route for any plugin
use the fallbacks method
correct case of URL
Make a real note
Merge pull request #2087 from antograssiot/3.0

3.0 add RecordNotFoundException description...
Two colons please
Oops, but not three
Complements creating-helpers usage example