Removed params permit step from 5.6 section [ci skip]
Space is not required for Set-Cookie header
Merge pull request #11201 from jetthoughts/fix_create_post_example_in_getting_started

Improve Getting Started Guide
remove string based terminators for `ActiveSupport::Callbacks`.
fix typo in Active Support CHANGELOG. [ci skip]
explain how to extend application templates. [ci skip]
Revert "remove string based terminators for `ActiveSupport::Callbacks`."

This reverts commit d108672dada7ba97d3b3b56f0c6001cea621061e.

Conflicts:

	activesupport/CHANGELOG.md
Merge pull request #11131 from ykzts/fix/actiondispatch-ssl-not-required-space

Space is not required for Set-Cookie header
Revert "Merge pull request #11299 from arunagw/disable_implicit_join_references_removed"

`disable_implicit_join_references=` was only deprecated on `master`,
not with rails 4.0. We can remove it after 4.1

This reverts commit 3c719ead414ffd29e71efce185698af979052abb, reversing
changes made to d5c3bf9722abd5733a769c8d789de3f74dbfb92d.