Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 13 insertions, 0 deletions

diff --git a/railties/lib/rails_generator/generators/components/model_subclass/USAGE b/railties/lib/rails_generator/generators/components/model_subclass/USAGE
new file mode 100644
index 0000000000..a4b558a401
--- /dev/null
+++ b/railties/lib/rails_generator/generators/components/model_subclass/USAGE
@@ -0,0 +1,13 @@
+Description:
+    Create a model subclass of parent, used for Single Table Inheritance.
+
+    Both subclass and parent name can be either CamelCased or under_scored.
+
+    This generates a model class in app/models and a unit test in test/unit.
+
+Examples:
+    `./script/generate model_subclass admin user`
+
+        creates an Admin model, which will inheritate from User model, test:
+            Model:      app/models/admin.rb
+            Test:       test/unit/admin_test.rb