Merge remote branch 'rails/master' into pg_schema_fu

1 files changed, 4 insertions, 4 deletions

diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 5f50943626..8c88b25617 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -84,7 +84,7 @@ module Rails
   # == Loading rake tasks and generators
   #
   # If your railtie has rake tasks, you can tell Rails to load them through the method
-  # rake tasks:
+  # rake_tasks:
   #
   #   class MyRailtie < Rails::Railtie
   #     rake_tasks do
@@ -174,11 +174,11 @@ module Rails
     def eager_load!
     end
 
-    def load_console(app)
+    def load_console(app=self)
       self.class.console.each { |block| block.call(app) }
     end
 
-    def load_tasks(app)
+    def load_tasks(app=self)
       extend Rake::DSL if defined? Rake::DSL
       self.class.rake_tasks.each { |block| block.call(app) }
 
@@ -190,7 +190,7 @@ module Rails
       end
     end
 
-    def load_generators(app)
+    def load_generators(app=self)
       self.class.generators.each { |block| block.call(app) }
     end