2 files changed, 3 insertions, 13 deletions
diff --git a/railties/lib/rails/tasks/engine.rake b/railties/lib/rails/tasks/engine.rake
index 70370be3f5..16ad1bfc84 100644
--- a/railties/lib/rails/tasks/engine.rake
+++ b/railties/lib/rails/tasks/engine.rake
@@ -26,7 +26,7 @@ namespace :db do
   desc "Display status of migrations"
   app_task "migrate:status"
 
-  desc 'Create the database from config/database.yml for the current Rails.env (use db:create:all to create all dbs in the config)'
+  desc 'Create the database from config/database.yml for the current Rails.env (use db:create:all to create all databases in the config)'
   app_task "create"
   app_task "create:all"
 
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 76a95304c3..bd4e7c33e0 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -1,6 +1,6 @@
 namespace :rails do
-  desc "Update configs and some other initially generated files (or use just update:configs, update:bin, or update:application_controller)"
-  task update: [ "update:configs", "update:bin", "update:application_controller" ]
+  desc "Update configs and some other initially generated files (or use just update:configs or update:bin)"
+  task update: [ "update:configs", "update:bin" ]
 
   desc "Applies the template supplied by LOCATION=(/path/to/template) or URL"
   task :template do
@@ -62,15 +62,5 @@ namespace :rails do
     task :bin do
       invoke_from_app_generator :create_bin_files
     end
-
-    # desc "Rename application.rb to application_controller.rb"
-    task :application_controller do
-      old_style = Rails.root + '/app/controllers/application.rb'
-      new_style = Rails.root + '/app/controllers/application_controller.rb'
-      if File.exists?(old_style) && !File.exists?(new_style)
-        FileUtils.mv(old_style, new_style)
-        puts "#{old_style} has been renamed to #{new_style}, update your SCM as necessary"
-      end
-    end
   end
 end