aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/configuring.textile
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-05-25 22:48:47 +0200
committerXavier Noria <fxn@hashref.com>2011-05-25 22:48:47 +0200
commit00e1d0832e1242fe41cf43490b0a3a21a40f3c26 (patch)
tree06d3fcf35727a37f78885fc63fe15ff265aa309a /railties/guides/source/configuring.textile
parentd25b7c2eeefff3a0abf7b532c10ce25a71d0fba2 (diff)
parent03f418370a4266e414ff32706381bb2b60baadfc (diff)
downloadrails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.tar.gz
rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.tar.bz2
rails-00e1d0832e1242fe41cf43490b0a3a21a40f3c26.zip
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
Diffstat (limited to 'railties/guides/source/configuring.textile')
-rw-r--r--railties/guides/source/configuring.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index fbe3d46367..135c849ec3 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -414,7 +414,7 @@ Rails has 5 initialization events which can be hooked into (listed in order that
* +to_prepare+: Run after the initializers are ran for all Railties (including the application itself), but before eager loading and the middleware stack is built.
-* +before_eager_load+: This is run directly before eager loading occurs, which is the default behaviour for the _production_ environment and not for the +development+ enviroment.
+* +before_eager_load+: This is run directly before eager loading occurs, which is the default behaviour for the _production_ environment and not for the +development+ environment.
* +after_initialize+: Run directly after the initialization of the application, but before the application initializers are run.