diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-22 18:24:17 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-22 18:24:17 +0000 |
| commit | 2a34e082f3262a9a934b8794737dab87b80d8fdd (patch) | |
| tree | 70796277b5c5f32884232a377477ff47cebcad97 | |
| parent | 046a87a85553173d02c2f349e05282235cea58a4 (diff) | |
| download | rails-2a34e082f3262a9a934b8794737dab87b80d8fdd.tar.gz rails-2a34e082f3262a9a934b8794737dab87b80d8fdd.tar.bz2 rails-2a34e082f3262a9a934b8794737dab87b80d8fdd.zip | |
Doc fixes (closes #8608) [deepblue]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7564 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/lib/initializer.rb | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 9ae0aa960f..b9fa9eee01 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -60,27 +60,26 @@ module Rails # Sequentially step through all of the available initialization routines, # in order: # + # * #check_ruby_version # * #set_load_path # * #require_frameworks + # * #set_autoload_paths # * #load_environment + # * #initialize_encoding # * #initialize_database # * #initialize_logger # * #initialize_framework_logging # * #initialize_framework_views # * #initialize_dependency_mechanism # * #initialize_whiny_nils + # * #initialize_temporary_directories # * #initialize_framework_settings - # * #load_environment + # * #add_support_load_paths # * #load_plugins # * #load_observers # * #initialize_routing # * #after_initialize # * #load_application_initializers - # - # (Note that #load_environment is invoked twice, once at the start and - # once at the end, to support the legacy configuration style where the - # environment could overwrite the defaults directly, instead of via the - # Configuration instance. def process check_ruby_version set_load_path @@ -99,11 +98,6 @@ module Rails initialize_temporary_directories initialize_framework_settings - # Support for legacy configuration style where the environment - # could overwrite anything set from the defaults/global through - # the individual base class configurations. - load_environment - add_support_load_paths load_plugins @@ -191,7 +185,7 @@ module Rails end # Loads the environment specified by Configuration#environment_path, which - # is typically one of development, testing, or production. + # is typically one of development, test, or production. def load_environment silence_warnings do return if @environment_loaded |