diff --git a/railties/lib/rails/tasks/annotations.rake b/railties/lib/rails/tasks/annotations.rake
index 79973b3145e1575d773e53888c4267d843d28a05..10a9311b2d75828f2b844c1709371929785ac7f8 100644
--- a/railties/lib/rails/tasks/annotations.rake
+++ b/railties/lib/rails/tasks/annotations.rake
@@ -13,7 +13,7 @@ namespace :notes do
     end
   end
 
-  desc "Enumerate a custom annotation, specify with ANNOTATION=WTFHAX"
+  desc "Enumerate a custom annotation, specify with ANNOTATION=CUSTOM"
   task :custom do
     SourceAnnotationExtractor.enumerate ENV['ANNOTATION']
   end
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 5d7c094d8b3cdd8b438542aeddeaf611d97e1fda..65d3c48f2d1283b03a3ff1310d5bd1e31b56ca70 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -1,80 +1,19 @@
 namespace :rails do
   namespace :freeze do
-    desc "Lock this application to the current gems (by unpacking them into vendor/rails)"
+    desc "The rails:freeze:gems is deprecated, please use bundle install instead"
     task :gems do
-      deps = %w(actionpack activerecord actionmailer activesupport activeresource)
-      require 'rubygems'
-      require 'rubygems/gem_runner'
-
-      rails = (version = ENV['VERSION']) ?
-        Gem.cache.find_name('rails', "= #{version}").first :
-        Gem.cache.find_name('rails').sort_by { |g| g.version }.last
-
-      version ||= rails.version
-
-      unless rails
-        puts "No rails gem #{version} is installed.  Do 'gem list rails' to see what you have available."
-        exit
-      end
-
-      puts "Freezing to the gems for Rails #{rails.version}"
-      rm_rf   "vendor/rails"
-      mkdir_p "vendor/rails"
-
-      begin
-        chdir("vendor/rails") do
-          rails.dependencies.select { |g| deps.include? g.name }.each do |g|
-            Gem::GemRunner.new.run(["unpack", g.name, "--version", g.version_requirements.to_s])
-            mv(Dir.glob("#{g.name}*").first, g.name)
-          end
-
-          Gem::GemRunner.new.run(["unpack", "rails", "--version", "=#{version}"])
-          FileUtils.mv(Dir.glob("rails*").first, "railties")
-        end
-      rescue Exception
-        rm_rf "vendor/rails"
-        raise
-      end
+      puts "The rails:freeze:gems is deprecated, please use bundle install instead"
     end
 
-    desc 'Lock to latest Edge Rails, for a specific release use RELEASE=1.2.0'
+    desc 'The freeze:edge command has been deprecated, specify the path setting in your app Gemfile instead and bundle install'
     task :edge do
-      require 'open-uri'
-      version = ENV["RELEASE"] || "edge"
-      target  = "rails_#{version}.zip"
-      commits = "http://github.com/api/v1/yaml/rails/rails/commits/master"
-      url     = "http://dev.rubyonrails.org/archives/#{target}"
-
-      chdir 'vendor' do
-        latest_revision = YAML.load(open(commits))["commits"].first["id"]
-
-        puts "Downloading Rails from #{url}"
-        File.open('rails.zip', 'wb') do |dst|
-          open url do |src|
-            while chunk = src.read(4096)
-              dst << chunk
-            end
-          end
-        end
-
-        puts 'Unpacking Rails'
-        rm_rf 'rails'
-        `unzip rails.zip`
-        %w(rails.zip rails/Rakefile rails/cleanlogs.sh rails/pushgems.rb rails/release.rb).each do |goner|
-          rm_f goner
-        end
-
-        touch "rails/REVISION_#{latest_revision}"
-      end
-
-      puts 'Updating current scripts, javascripts, and configuration settings'
-      Rake::Task['rails:update'].invoke
+      puts 'The freeze:edge command has been deprecated, specify the path setting in your app Gemfile instead and bundle install'
     end
   end
 
-  desc "Unlock this application from freeze of gems or edge and return to a fluid use of system gems"
+  desc 'The unfreeze command has been deprecated, please use bundler commands instead'
   task :unfreeze do
-    rm_rf "vendor/rails"
+    puts 'The unfreeze command has been deprecated, please use bundler commands instead'
   end
 
   desc "Update both configs, scripts and public/javascripts from Rails"
@@ -112,7 +51,7 @@ namespace :rails do
       invoke_from_app_generator :create_prototype_files
     end
 
-    desc "Add new scripts to the application script/ directory"
+    desc "Adds new scripts to the application script/ directory"
     task :scripts do
       invoke_from_app_generator :create_script_files
     end