diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-09-14 20:07:29 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-09-14 20:07:29 +0200 |
| commit | dd6efe98b62946ae4d4df0672292449226b8d6fc (patch) | |
| tree | 8854f46462eacc6355ca6f8da3d7111a57e036ea /railties/lib | |
| parent | 9362ef6e21e44341a5ef9d85ece468f407357ceb (diff) | |
| parent | b59a8d42c300651ad3384d4dab326454c088cbcc (diff) | |
| download | rails-dd6efe98b62946ae4d4df0672292449226b8d6fc.tar.gz rails-dd6efe98b62946ae4d4df0672292449226b8d6fc.tar.bz2 rails-dd6efe98b62946ae4d4df0672292449226b8d6fc.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'railties/lib')
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt index 7616614aff..91d3133ea4 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt @@ -1,5 +1,5 @@ <%= app_const %>.configure do - # Settings specified here will take precedence over those in config/environment.rb + # Settings specified here will take precedence over those in config/application.rb # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 500fc4d860..89bb891ddd 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -1,5 +1,5 @@ <%= app_const %>.configure do - # Settings specified here will take precedence over those in config/environment.rb + # Settings specified here will take precedence over those in config/application.rb # The production environment is meant for finished, "live" apps. # Code is not reloaded between requests diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt index 26cdef071a..d8d1e55157 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt @@ -1,5 +1,5 @@ <%= app_const %>.configure do - # Settings specified here will take precedence over those in config/environment.rb + # Settings specified here will take precedence over those in config/application.rb # The test environment is used exclusively to run your application's # test suite. You never need to work with it otherwise. Remember that |