Do not package the guides output

Fixes #17455
Merge branch 'tags-public-send'

Fixes #14180
Fixes #17461
Merge pull request #11694 from Empact/association-bind-values-not-updated-on-save

Fix that a collection proxy could be cached before the save of the owner, resulting in an invalid proxy lacking the owner’s id

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/collection_association.rb
	activerecord/test/cases/associations/has_many_associations_test.rb
Make FlashHash#key? work with symbol and string

Closes #17586
Merge pull request #17047 from betesh/master

Time includes DateAndTime::Zones acts_like(:time)
Conflicts:
	activesupport/lib/active_support/core_ext/time/zones.rb
correctly escape backslashes in request path globs

make sure that unreadable files are also not leaked

CVE-2014-7829
bumping version for relesase
Merge branch '4-0-sec' into 4-0-stable

* 4-0-sec:
  bumping version for relesase
  correctly escape backslashes in request path globs
correctly escape backslashes in request path globs

make sure that unreadable files are also not leaked

CVE-2014-7829
Preparing for 4.0.11.1 release
Merge branch '4-0-11-1' into 4-0-stable

Conflicts:
	RAILS_VERSION
	actionmailer/lib/action_mailer/version.rb
	actionpack/lib/action_pack/version.rb
	activemodel/lib/active_model/version.rb
	activerecord/lib/active_record/version.rb
	activesupport/lib/active_support/version.rb
	railties/lib/rails/version.rb
	version.rb
Sync CHANGELOG
Fix shell quote on the release task
`timestamps` and `add_timestamps` pass additional options. Closes #17624

Option passing was already supported when using `create_table` but not
for `change_table`. This patch aligns the method signatures.
make it possible to access fixtures excluded by a `default_scope`.

Prior to this patch you'd end up with an error like:

```
ActiveRecord::RecordNotFound: Couldn't find <Model> with 'id'=<id> [WHERE (<default_scope condition>)]
```

Conflicts:
	activerecord/CHANGELOG.md
Rename the primary key index when renaming a table in pg

Backport of dcc143cd702bfbfef9cb92e1fde75171d088a5ac

Fixes #12856
Closes #14088
Add array support when time zone aware attributes are enabled

Conflicts:
	activerecord/test/cases/adapters/postgresql/array_test.rb
Remove some warnings
Merge pull request #17866 from bogdan/default-form-builder

Bugfix config.action_view.default_form_builder option
Fix broken string_ext_test due to change in timezone

- Russian time was changed to UTC+3 from UTC+4 recently. This broke the
  string_to_ext test.