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
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
mark relation mutator as :nodoc: [ci skip]
Added a section on Rails Controller naming conventions.
Merge branch 'master' of github.com:lifo/docrails
adjust config.ru tempalte used in the rails on rack guide