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">
';
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
Remove “Sweepers” from Caching TOC and mention Page/Action caching are removed
script/rails could never be from bundler
need to delete bin, not binstub, update wording
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
fixed a article link at sitepoint
Merge pull request #132 from hlee/master

Fixed an article link at sitepoint
fix inverse_of association in block of new child

This fixes inconsistency when building children of association
which has inverse_of set properly.

When creating new association object with a block:

    parent.association.build do |child|
      child.parent.equal?(parent) # false
    end

So the block the `child.parent` did not point to the same object.
But when the object is created it points to same instance:

    child = parent.association.build
    child.parent.equal?(parent) # true
Merge pull request #129 from rafBM/master

Remove “Sweepers” from Caching TOC and mention Page/Action caching removal
Proofreading tweaks to the Mailer guide
Merge pull request #131 from lazylester/master

Edge rails new syntax for importing engine migration