added docs for InheritedOptions class [ci skip]
Clean up unused method for `rake doc`.
Merge pull request #10568 from siong1987/minor-refactoring

Clean up unused method for `rake doc`.
Merge pull request #10572 from nertzy/dont-modify-options-hash-in-primary-key

Don't modify args in TableDefinition#primary_key
Merge pull request #10567 from neerajdotname/read_attribute_before_type_cast_should_accept_symbol

read_attribute_before_type_cast should accept symbol
Call assume_migrated_upto_version on connection

Call assume_migrated_upto_version on connection to prevent it from first
being picked up in method_missing. In the base class, Migration,
method_missing expects the argument to be a table name, and calls
proper_table_name on the arguments before sending to connection. If
table_name_prefix or table_name_suffix is used, the schema version changes
to prefix_version_suffix, breaking `rake test:prepare`.

Fixes #10411.
Merge pull request #10503 from kstevens715/master

Avoid method missing when calling assume_migrated_upto_version (master)
Improve CHANGELOG entry [ci kip]
Adding documentation to the automatic inverse_of finder.
Merge pull request #10574 from wangjohn/automatic_inverse_of_documentation

Adding documentation to the automatic inverse_of finder.
ruby -> Ruby
Replace multi_json with json
Merge pull request #10576 from sferik/remove_multi_json_dependency

Replace multi_json with json
Fix class and method name typos
copy edits [ci skip]
Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	activesupport/lib/active_support/callbacks.rb
specify that dom_(id|class) are deprecated in controllers, views are fine
respond_to -> respond to in a message from AM::Lint

The error message uses English to say that the object should respond
to a certain method. You check that with respond_to, but that's not
English.

This makes this error message also consistent with the rest.
Some editorial changes on the documentation.

* Remove some autolinks
* Fix the rendered result
* Change sql to SQL

[ci skip]
Merge pull request #10556 from Empact/deprecate-schema-statements-distinct

Deprecate SchemaStatements#distinct, and make SchemaStatements#columns_for_distinct nodoc.
Conflicts:
	activerecord/CHANGELOG.md