diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-12-30 22:54:05 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-12-30 22:54:05 +0100 |
| commit | 904e3f4465cb2b874bd99000e96e2e6e0e03844c (patch) | |
| tree | a6b43dd78111f137362efb5124d841a4e35bb989 /railties/lib | |
| parent | e129c0698c1ae79ce6d4a97887685fc071689534 (diff) | |
| download | rails-904e3f4465cb2b874bd99000e96e2e6e0e03844c.tar.gz rails-904e3f4465cb2b874bd99000e96e2e6e0e03844c.tar.bz2 rails-904e3f4465cb2b874bd99000e96e2e6e0e03844c.zip | |
[ci skip] Space out framework names in USAGE
Two USAGE files were referring to Active Record and Active Model
without a space, which is incorrect because we're referring to
the framework name and not the constants.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/model/USAGE | 8 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold/USAGE | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/rails/model/USAGE b/railties/lib/rails/generators/rails/model/USAGE index 11daa5c3cb..025bcf4774 100644 --- a/railties/lib/rails/generators/rails/model/USAGE +++ b/railties/lib/rails/generators/rails/model/USAGE @@ -8,14 +8,14 @@ Description: As a special case, specifying 'password:digest' will generate a password_digest field of string type, and configure your generated model and - tests for use with ActiveModel has_secure_password (assuming the default ORM + tests for use with Active Model has_secure_password (assuming the default ORM and test framework are being used). You don't have to think up every attribute up front, but it helps to sketch out a few so you can start working with the model immediately. This generator invokes your configured ORM and test framework, which - defaults to ActiveRecord and TestUnit. + defaults to Active Record and TestUnit. Finally, if --parent option is given, it's used as superclass of the created model. This allows you create Single Table Inheritance models. @@ -91,7 +91,7 @@ Available field types: Examples: `rails generate model account` - For ActiveRecord and TestUnit it creates: + For Active Record and TestUnit it creates: Model: app/models/account.rb Test: test/models/account_test.rb @@ -104,7 +104,7 @@ Examples: `rails generate model admin/account` - For ActiveRecord and TestUnit it creates: + For Active Record and TestUnit it creates: Module: app/models/admin.rb Model: app/models/admin/account.rb diff --git a/railties/lib/rails/generators/rails/scaffold/USAGE b/railties/lib/rails/generators/rails/scaffold/USAGE index d2e495758d..c9283eda87 100644 --- a/railties/lib/rails/generators/rails/scaffold/USAGE +++ b/railties/lib/rails/generators/rails/scaffold/USAGE @@ -16,7 +16,7 @@ Description: As a special case, specifying 'password:digest' will generate a password_digest field of string type, and configure your generated model, - controller, views, and test suite for use with ActiveModel + controller, views, and test suite for use with Active Model has_secure_password (assuming they are using Rails defaults). Timestamps are added by default, so you don't have to specify them by hand |