diff options
| author | José Valim <jose.valim@gmail.com> | 2010-07-24 00:49:16 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-24 00:49:16 +0200 |
| commit | 7a7cbab1f4204093796c8d1d3b74a4170cb302c2 (patch) | |
| tree | cd1c982df9f7612b6473e5428c3912c47a9b0dd4 /actionpack | |
| parent | 76b6136b00a9d0a74f99ca4f1ae347230bde94e0 (diff) | |
| parent | 728ba209e7ec3126848ec58cc1388e9eff8145e5 (diff) | |
| download | rails-7a7cbab1f4204093796c8d1d3b74a4170cb302c2.tar.gz rails-7a7cbab1f4204093796c8d1d3b74a4170cb302c2.tar.bz2 rails-7a7cbab1f4204093796c8d1d3b74a4170cb302c2.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/Rakefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index f8b00e5327..4af8ea167a 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -2,7 +2,7 @@ gem 'rdoc', '>= 2.5.9' require 'rdoc' require 'rake' require 'rake/testtask' -require 'rake/rdoctask' +require 'rdoc/task' require 'rake/packagetask' require 'rake/gempackagetask' @@ -38,12 +38,12 @@ end # Genereate the RDoc documentation -Rake::RDocTask.new { |rdoc| +RDoc::Task.new { |rdoc| rdoc.rdoc_dir = 'doc' rdoc.title = "Action Pack -- On rails from request to response" - rdoc.options << '--line-numbers' << '--inline-source' rdoc.options << '--charset' << 'utf-8' - rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo' + rdoc.options << '-f' << 'horo' + rdoc.options << '--main' << 'README.rdoc' if ENV['DOC_FILES'] rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/)) else |