aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/Rakefile4
-rwxr-xr-xrelease.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/Rakefile b/railties/Rakefile
index 04a1162c74..51469b30ad 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -260,12 +260,12 @@ desc "Generate documentation for the framework and for the empty application"
task :generate_documentation => [ :generate_app_doc, :generate_rails_framework_doc ]
task :generate_rails_framework_doc do
- system %{cd #{PKG_DESTINATION}; rake apidoc}
+ system %{cd #{PKG_DESTINATION}; rake doc:rails}
end
task :generate_app_doc do
File.cp "doc/README_FOR_APP", "#{PKG_DESTINATION}/doc/README_FOR_APP"
- system %{cd #{PKG_DESTINATION}; rake appdoc}
+ system %{cd #{PKG_DESTINATION}; rake doc:app}
end
Rake::RDocTask.new { |rdoc|
diff --git a/release.rb b/release.rb
index fcb483bbce..345110c045 100755
--- a/release.rb
+++ b/release.rb
@@ -18,8 +18,8 @@ PACKAGES = %w( activesupport activerecord actionpack actionmailer actionwebservi
end
# Upload rails tgz/zip
-`rubyforge add_release rails rails 'REL #{VERSION}' rails-#{VERSION}.tgz`
-`rubyforge add_release rails rails 'REL #{VERSION}' rails-#{VERSION}.zip`
+`rubyforge add_release rails rails 'REL #{VERSION}' release/rails-#{VERSION}.tgz`
+`rubyforge add_release rails rails 'REL #{VERSION}' release/rails-#{VERSION}.zip`
# Create SVN tag
puts "Remember to create SVN tag"