Minor doc fix of ActiveModel::Naming.

- qoute example line's result when it kind of String
- right ("singular_route_key") method in example
Merge pull request #12686 from kryzhovnik/master

Minor doc fix of ActiveModel::Naming. [ci skip]

Conflicts:
	activemodel/lib/active_model/naming.rb
Added ActiveRecord::Base#enum for declaring enum attributes where the values map to integers in the database, but can be queried by name
Revert "Merge pull request #9660 from sebasoga/change_strong_parameters_require_behaviour"

This reverts commit c2b5a8e61ba0f35015e6ac949a5c8fce2042a1f2, reversing
changes made to 1918b12c0429caec2a6134ac5e5b42ade103fe90.

See: https://github.com/rails/rails/pull/9660#issuecomment-27627493
Update guides welcome page to point to version 3.2.15 [ci skip]
Improve wording in AC::ParameterMissing error message
Fix to work on Ruby 1.9.3, example and changelog improvements
Use an already existing fixture
Added Numeric#in_milliseconds, like 1.hour.in_milliseconds, so we can feed them to JavaScript functions like getTime().
Merge branch 'master' of github.com:rails/rails
Extend ActiveRecord::Base#cache_key to take an optional list of timestamp attributes of which the highest will be used.
Add a test case for the scope enum adds
unscope now works on default_scope after 94924dc32baf78f13e289172534c2e71c9c8cade
Added ActiveRecord::QueryMethods#rewhere which will overwrite an existing, named where condition.
Explicit mapping for enum
Merge pull request #12747 from yury/explicit-enum-values

Explicit mapping for enum
Move documentation around a bit
Delegate #rewhere to all on the class like all other relation methods
Revert "ActiveRecord::Base#<=> has been removed.  Primary keys may not be in order," -- will be replaced with a check to ensure that the keys used for comparison are integers, and only fail if they are not.

This reverts commit 6256734e2d0bdd89f4b5d11da259d40afa0c95c7.

Conflicts:
	activerecord/CHANGELOG.md
Add test verifying that you can only sort ARs of the same type