Update url to rake docs [ci skip]
"controllers" should be a valid path name
Merge branch 'master' into mapper

* master:
  Update url to rake docs [ci skip]
  Name#model_name doesn't return a String object
  Result sets never override a model's column type
  [ci skip] Make last note show up in postgresql guide.
  Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581.
  Add @senny's changed from #14741, including code font for `resources` options, and wrapped to 80 chars. [ci skip]
  Use github url for homepage of log4r [ci skip]
  Remove TODO.
  Ensure we always use instances of the adapter specific column class
  Fix indentation from 1b4b26f [ci skip]
  [ci skip] Improve form_helpers.md guide.
  Clear inflections after test.
  Remove unnecessary include for integration tests.
  Added documentation for the :param option for resourceful routing
Refactor serialized types to be partially defined as custom properties

Many of the methods defined in `AttributeMethods::Serialization` can be
refactored onto this type as well, but this is a reasonable small step.
Removes the `Type` class, and the need for `decorate_columns` to handle
serialized types.
[ci skip] add created_at and updated_at to example
document generators hidden_namespaces
Merge pull request #15398 from sgrif/sg-serialized-types

Refactor serialized types to be partially defined as custom properties
Fix broken link in Rails 3.0 release_notes
Merge pull request #15411 from nathany/patch-1

Fix broken link in Rails 3.0 release_notes [ci skip]
Add missing period from 4b802bc [ci skip]
Move `type_cast_for_write` behavior over to the serialized type object
Merge pull request #15412 from sgrif/sg-serialized-type-cast-for-write

Move `type_cast_for_write` behavior over to the serialized type object
Don't reference comments that do not exist
Merge pull request #15413 from sgrif/sg-i-wish-i-could

Don't reference comments that do not exist
Generated engines don't include bin/rake, fixes #15409 [ci skip]
[ci skip] Include ActiveModel::Model in a class instead of inheriting
pass the parsed parameters through the methods so we don't reparse or
require caching code
use a parser to extract the group parts from the path
Merge pull request #15414 from akshay-vishnoi/doc_changes

[ci skip] Include ActiveModel::Model in a class instead of inheriting
reuse the ast we already made