Use ActionView::OutputBuffer#safe_append= from templates
avoid extra method calls for appending newlines

before:

        ');@output_buffer.append= ( content_icon row[:content] );@output_buffer.safe_concat('
');@output_buffer.safe_concat('        ');@output_buffer.append= ( spinner_img );@output_buffer.safe_concat('
');@output_buffer.safe_concat('      </td>
      <td class="content">
        ');@output_buffer.append= ( content_link row[:content] );@output_buffer.safe_concat('
');@output_buffer.safe_concat('      </td>
      <td class="message">
');

after:

        ';@output_buffer.append=( content_icon row[:content] );@output_buffer.safe_append='
        ';@output_buffer.append=( spinner_img );@output_buffer.safe_append='
      </td>
      <td class="content">
        ';@output_buffer.append=( content_link row[:content] );@output_buffer.safe_append='
      </td>
      <td class="message">
';
+ Add test for auto timestamps update of both old & new parent records
Modifies belong_to touch callback to touch old associations also #9091
Exception handling for controllers using ActionController::Live

Any exceptions that occured at the view or controller level for a
controller using ActionController::Live would cause the server to either
hang with an open socket indefinitely, or immediately crash (depending
on whether the server was launched with rails s or directly). Changed
the behavior of exceptions to act the same as streaming templates for
html requests, and allow for an on_error callback if needed.
rails commands even if bin/rails is a gem stub
failure to parse params should trigger a 400 Bad Request
Remove “Sweepers” from Caching TOC and mention Page/Action caching are removed
bugfix, when matching multiple paths with `get`, `post`, ...

This problem was introduced with:

https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff
routing shorthand syntax works with multiple paths

Closes #9913.

We need to expand the match shorthand syntax for every path.
script/rails could never be from bundler
need to delete bin, not binstub, update wording
Improve poor security recommendation in docs

As reported in #9960, the current documentation recommends an insecure practice for
key generation from a password (a single round of SHA-256). The modified documentation
uses ActiveSupport::KeyGenerator to perform proper key stretching.
Revert "Using American English spellings over British style spellings"

This reverts commit 573df1cf2a5d5d1f288c8a4a5d76194675141832.

Reason: changelog edits aren't allowed in docrails.

[ci skip]
Merge branch 'master' of github.com:rails/rails
minor copy editing
fix binstub typo
Fix typo
Remove unnecessary / confusing code in example
as of Rails 3.2.13 it appears that importing an engine's migration into the host app is achieved by rake blorgh_engine:install:migrations