aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-01-21 23:14:10 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-01-21 23:14:10 +0000
commit3c8dbcbdf91e17925bbbd3bc8fe5291bdd801427 (patch)
tree41b0bb9ae164dcf906d525bca6c784b84982d86b
parent8fe6b90e5fecf276bf24542e513ad6496da283da (diff)
downloadrails-3c8dbcbdf91e17925bbbd3bc8fe5291bdd801427.tar.gz
rails-3c8dbcbdf91e17925bbbd3bc8fe5291bdd801427.tar.bz2
rails-3c8dbcbdf91e17925bbbd3bc8fe5291bdd801427.zip
Fixed documentation tasks to work with Rake 0.7.0 (closes #3563) [kazuhiko@fdiary.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3451 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/tasks/documentation.rake4
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')