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
[doc] fixed printing of code samples
Cleanup ul_encoded_params_parsing_test
 #11288: Removed duplicated touching

if belongs to model with touch option on touch

Closes #11288
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
Make HashWithIndifferentAccess#select always return the hash.

Hash#select! returns nil if the hash didn't change and thus behaves differently
from select, so it's return value can't be used as result for the latter.
Merge pull request #11327 from schuetzm/hash-with-indifferent-access-select

Make HashWithIndifferentAccess#select always return the hash.
Extract common query to a constant.

Perf ref: https://gist.github.com/vipulnsward/8209749201dfdd678c97
Merge pull request #11329 from vipulnsward/cache_one

Extract common query to a constant.
Remove action view test duplication

Same test exists above 2 or 3 lines.
Merge pull request #11332 from sanemat/fix/av-test-duplication

Remove actionview test duplication
fixes broken links in the API [Fixes #11335] [ci skip]
Merge pull request #11306 from jetthoughts/11288_remove_extra_queries_for_belongs_to_with_touch

 #11288: Removed duplicated touching

Conflicts:
	activerecord/CHANGELOG.md
fixes Rails version for the stable API [ci skip]
RUNNING_UNIT_TESTS file is in rdoc [ci skip]
actionpack not having activerecord tests [ci skip]