Merge pull request #12686 from kryzhovnik/master

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

Conflicts:
	activemodel/lib/active_model/naming.rb