GitHub is now able to notify tag creation, I have configured the webhook
for the docs server to receive that event. Therefore, we no longer need
to trigger docs generation manually when releasing.

update guides to new version of rails 3.2.x, i.e. 3.2.17 [skip ci]

This reverts commit 5e3d466d.

Fix `render_to_string` when called via manually instantiated controllers

closes #14125

Fix the javascript path in guide for asset modules [skip ci]

Fix collection proxy exists? regression

[related #14116]

This reverts commit f9e4c3c7.

[fixes #14116]

change 'assert !' to 'assert_not' in guides [ci skip] 

Add note to silence_stream and quietly. [skip ci]

State that on the doc.

[fixes #11954]

Close the meta tag with '/>' instead of '>'

This change fixes the 42 instances of `end tag for "meta" omitted, but
OMITTAG NO was specified` error message that comes up when the full
railsguides are validated.

Full error list at
https://gist.github.com/prakashmurthy/9086679.

The errors were introduced in e220a34e

Update Docs in favor to use render plain instead of text option

ref #14062

Typo fix for unscope [ci skip]

Before we were calling to_sym in the mime type, even when it is unknown
what can cause denial of service since symbols are not removed by the
garbage collector.

Fixes: CVE-2014-0082

Conflicts:
	actionview/CHANGELOG.md
	activerecord/CHANGELOG.md

Thanks Godfrey Chan for reporting this!

Fixes: CVE-2014-0080

Previously the values of these options were trusted leading to
potential XSS vulnerabilities.

Fixes: CVE-2014-0081

Sync 4.1 release notes with changes since 7f648bc7

Introduce `:plain`, `:html`, and `:body` render options.

Setting this attribute to `true` will remove the content type header
from the request. This is use in `render :body` feature.

* Introduces `:plain`, `:html`, `:body` render option.
* Update guide to use `render :plain` instead of `render :text`.

This test were assuming that the list of render options will always be
the same. Fixing that so this doesn't break when we add/remove render
option in the future.

This is an option for to HTML content with a content type of
`text/html`. This rendering option calls `ERB::Util.html_escape`
internally to escape unsafe HTML string, so you will have to mark your
string as html safe if you have any HTML tag in it.

Please see #12374 for more detail.