* upstream/master: (76 commits)
use content_tag instead strings
A guide for upgrading Rails [ci skip]
copy-edits [ci skip]
Update changelogs with rails 3.0-stable branch info
Remove wrong and redundant code.
put and patch both are allowed for update
fixes a test: rake routes now includes PATCH for resources
use regular ruby for fewer method calls. we do not need 🎁s!
consistently mention first patch, then put
uses PATCH for the forms of persisted records, and routes PATCH and PUT to the update action of resources
decouples the implementation of the inflector from its test suite
removes the reconnect key from the database.yml generated for MySQL
Fixed typo in composed_of example with Money#<=>, was comparing amount itself instead of other_money.amount
explains why reconnect is false by default in the database.yml generated for MySQL
Fix typo in match :to docs
correct fetching :name option in form fields
Update with new task names for building mysql and postgresql databases
Document the :host option for force_ssl
Update documentation for force_ssl - closes #5023.