aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-07-23 12:15:41 +0200
committerXavier Noria <fxn@hashref.com>2011-07-23 12:15:41 +0200
commitace3723d2fcb1a96d51c2c82050594129328d7c0 (patch)
treed95d16b7dfee13037987913ed71d1708b5484f15 /railties/lib/rails/application.rb
parent94978b9a46173b875bcb0d5cb724e5119e4aa8f4 (diff)
parent38310ab1a6f559860e25b0e28bef9560bb452ae6 (diff)
downloadrails-ace3723d2fcb1a96d51c2c82050594129328d7c0.tar.gz
rails-ace3723d2fcb1a96d51c2c82050594129328d7c0.tar.bz2
rails-ace3723d2fcb1a96d51c2c82050594129328d7c0.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 559739b2ec..9e2f1a4b7a 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -11,7 +11,7 @@ module Rails
# == Initialization
#
# Rails::Application is responsible for executing all railties, engines and plugin
- # initializers. Besides, it also executed some bootstrap initializers (check
+ # initializers. It also executes some bootstrap initializers (check
# Rails::Application::Bootstrap) and finishing initializers, after all the others
# are executed (check Rails::Application::Finisher).
#