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
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
Cleanup ul_encoded_params_parsing_test
Merge pull request #11131 from ykzts/fix/actiondispatch-ssl-not-required-space

Space is not required for Set-Cookie header
 #11288: Removed duplicated touching

if belongs to model with touch option on touch

Closes #11288
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.
Adding back deprecation require in all.rb
Merge pull request #11314 from raysrashmi/fix-missing-deprecation-stuff

Adding back deprecation require in all.rb
Merge branch 'master' of github.com:rails/docrails
Merged sections to reflect current contents of guide.

Section "allowing the update of fields" was now just a general
introduction to the idea of the model (actual updating was two sections
later).  So, merged into the section about validation.
Merge pull request #11322 from blahedo/master

Tidying "getting started" guide