Merge branch 'master' of github.com:rails/docrails
Merge pull request #11756 from zilkey/master

added String#to_date documentation to Rails 4 upgrade guide [ci skip]
test-case for fixed issue #11870.
Merge pull request #11544 from prathamesh-sonpatki/namespaced_routes_test

Generate namespaced routes correctly for generators. Fix for #11532
Merge pull request #11617 from swooop/doc_sanitize

Added SanitizeHelper to rails guide docs [ci skip]
document `assert_not_XYZ` in place of `refute_XYZ`.
Removed redundant asserts for assigns attribute operation
Merge pull request #11886 from jetthoughts/remove_redundant_assert_from_datatype_test

Removed redundant asserts for assigns attribute operation
Rescue invalid ip address exceptions on assign.

In order that set attribute should not be bang method
Merge pull request #11574 from jetthoughts/11552_rescue_on_invalid_inet_assign

Fix assign ip address with invalid values raise exception
Added docs for 'remove' method [ci skip]
Added new line [ci skip]
Typo Fix[ci skip]
Merge pull request #11887 from raysrashmi/typo_fix

Typo Fix[ci skip]
Normalize file parameters in same place as other parameters (ActionDispatch::Http::Parameters#normalize_encode_params)
Fixing multi-word automatic inverse detection.

Currently, ActiveRecord models with multiple words cannot have their
inverse associations detected automatically.
Merge pull request #11897 from wangjohn/fixing_multiple_word_inverse_detection

Fixing multi-word automatic inverse detection.
Adding LESS to rake notes
Merge pull request #11900 from onlymejosh/add_less_to_rake_todos

Adding LESS to rake notes
fix build error caused by #11900.