cookies are encrypted starting Rails 4
doc for more input tag types
Complete a sentence in i18n guide's introduction

Add a list of what will be covered into this guide
Removed params permit step from 5.6 section [ci skip]
[doc] fixed printing of code samples
Missing closing + in documentation [ci skip]
Remove deprecated String constructor from `ActiveRecord::Migrator`.
Merge pull request #11286 from edogawaconan/fix/doc-201307041646

Missing closing + in documentation [ci skip]
Merge pull request #11285 from ankit8898/master

Fixing the broken wikipedia link for Optimistic Concurrency control [ci skip]
Remove deprecated block filter from `ActiveRecord::Migrator#migrate`.
replace artificial space with RDoc markup (follow up #11285). [ci skip]
Remove deprecated nil-passing to `SchemaCache` methods.
build fix: railties tests used deprecated `SchemaCache` methods.
remove useless `env.merge!(env)` from ActionDispatch::IntegrationTest`
remove leftover if after deprecation removal (68563128).
Removed redundant upgrade docs on new cookies.

[ci skip]
Merge pull request #11261 from ryan-endacott/fixguide

Removed redundant upgrade docs on new cookies.
Merge pull request #11295 from ankit8898/master

Replaced older rocket sign to new  ":"
Merge pull request #11297 from ankit8898/master

SQL keywords in UPPERCASE
Removed unsued deprecation require