Added documentation for the :param option for resourceful routing
Merge branch 'master' of github.com:zackperdue/rails into zackperdue-master
Add @senny's changed from #14741, including code font for `resources`
options, and wrapped to 80 chars. [ci skip]
Add missing `:param` option from the docs for Mapper#match [ci skip]
Option discovered by @zackperdue in #14741, implemented in #5581.