Merge branch 'master' of http://github.com/rails/rails

1 files changed, 7 insertions, 7 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index ddc872e18b..8e78d2ff4a 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -1,8 +1,8 @@
-gem 'rdoc', '= 2.2'
+gem 'rdoc', '>= 2.5.9'
 require 'rdoc'
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/gempackagetask'
 
 require 'date'
@@ -39,7 +39,7 @@ desc "Updates application README to the latest version Railties README"
 task :update_readme do
   readme = "lib/rails/generators/rails/app/templates/README"
   rm readme
-  cp "./README", readme
+  cp "./README.rdoc", readme
 end
 
 desc 'Generate guides (for authors), use ONLY=foo to process just "foo.textile"'
@@ -60,13 +60,13 @@ end
 
 # Generate documentation ------------------------------------------------------------------
 
-Rake::RDocTask.new { |rdoc|
+RDoc::Task.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Railties -- Gluing the Engine to the Rails"
-  rdoc.options << '--line-numbers' << '--inline-source' << '--accessor' << 'cattr_accessor=object'
+  rdoc.options << '-f' << 'horo'
+  rdoc.options << '--main' << 'README.rdoc'
   rdoc.options << '--charset' << 'utf-8'
-  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
-  rdoc.rdoc_files.include('README', 'CHANGELOG')
+  rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.rdoc_files.exclude('lib/rails/generators/**/templates/*')
 }