diff options
Diffstat (limited to 'railties')
-rw-r--r-- | railties/CHANGELOG | 2 | ||||
-rw-r--r-- | railties/lib/tasks/documentation.rake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 9c53450d82..1a38c3c0ef 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed documentation tasks to work with Rake 0.7.0 #3563 [kazuhiko@fdiary.net] + * Update to Prototype 1.5.0_pre0 [Sam Stephenson] * Sort the list of plugins so we load in a consistent order [Rick Olson] diff --git a/railties/lib/tasks/documentation.rake b/railties/lib/tasks/documentation.rake index e0ed801b21..83704a0d10 100644 --- a/railties/lib/tasks/documentation.rake +++ b/railties/lib/tasks/documentation.rake @@ -16,7 +16,7 @@ plugins.each do |plugin| files = Rake::FileList.new options << "-o doc/plugins/#{plugin}" options << "--title '#{plugin.titlecase} Plugin Documentation'" - options << '--line-numbers --inline-source' + options << '--line-numbers' << '--inline-source' options << '-T html' files.include("#{plugin_base}/lib/**/*.rb") @@ -45,7 +45,7 @@ Rake::RDocTask.new("apidoc") { |rdoc| rdoc.rdoc_dir = 'doc/api' rdoc.template = "#{ENV['template']}.rb" if ENV['template'] rdoc.title = "Rails Framework Documentation" - rdoc.options << '--line-numbers --inline-source' + rdoc.options << '--line-numbers' << '--inline-source' rdoc.rdoc_files.include('README') rdoc.rdoc_files.include('vendor/rails/railties/CHANGELOG') rdoc.rdoc_files.include('vendor/rails/railties/MIT-LICENSE') |