Add inline literal for app/Lib
Merge pull request #845 from bcrowe/hotfix-applib

Add inline literal for app/Lib
Replace indices with indexes
Merge pull request #846 from bcrowe/hotfix-indices

Replace indices with indexes
Update to counterScope
Merge pull request #847 from andraskende/patch-1

Update to counterScope
[fr] Follow #845

Add inline literal for app/Lib
[fr] Follow #847

Update to counterScope
Migration update for pagination helper and lock
wording
Merge pull request #848 from dereuromark/2.5-pagination-lock

Migration update for pagination helper and lock
Add lock option, add missing direction option
Make general edits to paginator component docs
Merge pull request #850 from bcrowe/hotfix-paginationComponent

Make general edits to paginator component docs
Capitalize AJAX in paginator component docs
Merge branch 'master' into 2.5

Conflicts:
	en/core-libraries/caching.rst
	en/core-libraries/components/cookie.rst
	en/core-utility-libraries/file-folder.rst
	en/core-utility-libraries/hash.rst
	en/development/sessions.rst
Merge pull request #851 from bcrowe/hotfix-ajaxPagination

Capitalize AJAX in paginator component docs
Add note about lock to version add
Fixed typo
Adds docs for File::replaceText().

Refs cakephp/cakephp#1665.