aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-11-30 14:53:22 -0600
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-11-30 14:53:22 -0600
commit201b64b4e1fd007c8da1374da4196f24e2661f21 (patch)
tree85fa21709fc3655004651a871b55f77ad9df895f
parent0eac9daa0a333ede2252203a67f86638f0e811c8 (diff)
downloadrails-201b64b4e1fd007c8da1374da4196f24e2661f21.tar.gz
rails-201b64b4e1fd007c8da1374da4196f24e2661f21.tar.bz2
rails-201b64b4e1fd007c8da1374da4196f24e2661f21.zip
Cleanup other examples and wording
-rw-r--r--railties/environments/environment.rb14
1 files changed, 5 insertions, 9 deletions
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 49c6a5c888..b1a0604abf 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -11,20 +11,17 @@ Rails::Initializer.run do |config|
# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.
- # Skip frameworks you're not going to use. To use Rails without a database
+ # Skip frameworks you're not going to use. To use Rails without a database,
# you must remove the Active Record framework.
# config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
- # Specify gems that this application depends on.
- # They can then be installed with "rake gems:install" on new installations.
- # You have to specify the :lib option for libraries, where the Gem name (sqlite3-ruby) differs from the file itself (sqlite3)
+ # Specify gems that this application depends on and have them installed with rake gems:install
# config.gem "bj"
# config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
# config.gem "sqlite3-ruby", :lib => "sqlite3"
# config.gem "aws-s3", :lib => "aws/s3"
- # Only load the plugins named here, in the order given. By default, all plugins
- # in vendor/plugins are loaded in alphabetical order.
+ # Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named
# config.plugins = [ :exception_notification, :ssl_requirement, :all ]
@@ -40,9 +37,9 @@ Rails::Initializer.run do |config|
# Run "rake -D time" for a list of tasks for finding time zone names. Comment line to use default local time.
config.time_zone = 'UTC'
- # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
+ # The internationalization framework can be changed to have another default locale (default is :en) or more load paths.
# All files from config/locales/*.rb,yml are added automatically.
- # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
+ # config.i18n.load_path << Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
# config.i18n.default_locale = :de
# Your secret key for verifying cookie session data integrity.
@@ -65,6 +62,5 @@ Rails::Initializer.run do |config|
# config.active_record.schema_format = :sql
# Activate observers that should always be running
- # Please note that observers generated using script/generate observer need to have an _observer suffix
# config.active_record.observers = :cacher, :garbage_collector, :forum_observer
end