Merge pull request #11095 from vipulnsward/rails_4_docs

We are now rails 4
Merge pull request #11096 from akalyaev/remove-unnecessary-mapping

removed unnecessary mapping for on options