diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-13 18:41:09 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-13 18:41:09 +0200 |
| commit | 6d2e4ee96c22502380dc94bebdead56133143b9e (patch) | |
| tree | d25bddeda96903d0a6ec75ca087898875fa2981d /railties/lib/rails | |
| parent | b75fca9e57423eec81384ff3e35f38fd4f7fe47f (diff) | |
| parent | 7e075e62479a0eccad6eaf7a7c20f45347860c83 (diff) | |
| download | rails-6d2e4ee96c22502380dc94bebdead56133143b9e.tar.gz rails-6d2e4ee96c22502380dc94bebdead56133143b9e.tar.bz2 rails-6d2e4ee96c22502380dc94bebdead56133143b9e.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/actions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index a27d38e23a..2280cc1507 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -40,7 +40,7 @@ module Rails end end - # Adds an entry into config/environment.rb for the supplied gem. If env + # Adds an entry into Gemfile for the supplied gem. If env # is specified, add the gem to the given environment. # # ==== Example @@ -100,7 +100,7 @@ module Rails end end - # Adds a line inside the Initializer block for config/environment.rb. + # Adds a line inside the Application class for config/application.rb. # # If options :env is specified, the line is appended to the corresponding # file in config/environments. |