diff options
| author | TomK32 <tomk32@tomk32.de> | 2008-06-11 19:22:51 +0200 |
|---|---|---|
| committer | TomK32 <tomk32@tomk32.de> | 2008-06-11 19:22:51 +0200 |
| commit | 6a5ac86207765e2c041378b35c05812f9bfe68b9 (patch) | |
| tree | 4b341329991f2bd08c01d2f139c4c3721a8fbe25 /railties/environments | |
| parent | fa0cca368f74119b561595cc6ca7454f7debdf6b (diff) | |
| parent | d4b7cd99e8e7051c9d3ed6722f9627d5d4dea4e9 (diff) | |
| download | rails-6a5ac86207765e2c041378b35c05812f9bfe68b9.tar.gz rails-6a5ac86207765e2c041378b35c05812f9bfe68b9.tar.bz2 rails-6a5ac86207765e2c041378b35c05812f9bfe68b9.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/environments')
| -rw-r--r-- | railties/environments/environment.rb | 10 | ||||
| -rw-r--r-- | railties/environments/test.rb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index c33b80da4f..a85ade371b 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -21,7 +21,7 @@ Rails::Initializer.run do |config| # config.frameworks -= [ :active_record, :active_resource, :action_mailer ] # Specify gems that this application depends on. - # They can then be installed with rake gem:install on new installations. + # They can then be installed with "rake gems:install" on new installations. # config.gem "bj" # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" # config.gem "aws-s3", :lib => "aws/s3" @@ -38,9 +38,9 @@ Rails::Initializer.run do |config| # (by default production uses :info, the others :debug) # config.log_level = :debug - # Make Time.zone default to the specified zone, and make ActiveRecord store time values + # Make Time.zone default to the specified zone, and make Active Record store time values # in the database in UTC, and return them converted to the specified local zone. - # Run `rake -D time` for a list of tasks for finding time zone names. Uncomment to use default local time. + # Run "rake -D time" for a list of tasks for finding time zone names. Uncomment to use default local time. config.time_zone = 'UTC' # Your secret key for verifying cookie session data integrity. @@ -54,7 +54,7 @@ Rails::Initializer.run do |config| # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information - # (create the session table with 'rake db:sessions:create') + # (create the session table with "rake db:sessions:create") # config.action_controller.session_store = :active_record_store # Use SQL instead of Active Record's schema dumper when creating the test database. @@ -64,4 +64,4 @@ Rails::Initializer.run do |config| # Activate observers that should always be running # config.active_record.observers = :cacher, :garbage_collector -end
\ No newline at end of file +end diff --git a/railties/environments/test.rb b/railties/environments/test.rb index 58850a7974..1e709e1d19 100644 --- a/railties/environments/test.rb +++ b/railties/environments/test.rb @@ -16,7 +16,7 @@ config.action_controller.perform_caching = false # Disable request forgery protection in test environment config.action_controller.allow_forgery_protection = false -# Tell ActionMailer not to deliver emails to the real world. +# Tell Action Mailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test |