Typppo
Update capture_helper.rb

if there's content for the right column, then we need the two-column class, if not the one-column
fixes active_record_querying #pluck example
remove the new metadata note in Rails 4 upgrade guide

this was pulled out of Rails 4, see rails/rails#8399 for the discussion
Some copy edit and formatting for upgrading guide.
Explained how merging of scope works
fixing typo in the merging scopes section
Adding a note for :body option in `mail` method.
strong parameter example for hashes with integer keys.

This replicates the situation described in
https://github.com/rails/strong_parameters/issues/114
fixed typo in strong parameters example
copy edits [ci skip]
Merge branch 'master' of github.com:lifo/docrails