0
@@ -1,5 +1,5 @@
0
 debug.log
0
-doc
0
+doc/rdoc
0
 activeresource/doc
0
 activerecord/doc
0
 actionpack/doc

0
@@ -13,7 +13,7 @@ end
0
 desc 'Run all tests by default'
0
 task :default => :test
0
 
0
-%w(test rdoc package release).each do |task_name|
0
+%w(test rdoc pgem package release).each do |task_name|
0
   desc "Run #{task_name} task for all projects"
0
   task task_name do
0
     PROJECTS.each do |project|
0
@@ -25,14 +25,14 @@ end
0
 
0
 desc "Generate documentation for the Rails framework"
0
 Rake::RDocTask.new do |rdoc|
0
-  rdoc.rdoc_dir = 'doc'
0
-  rdoc.title    = "Rails Framework Documentation"
0
+  rdoc.rdoc_dir = 'doc/rdoc'
0
+  rdoc.title    = "Ruby on Rails Documentation"
0
 
0
   rdoc.options << '--line-numbers' << '--inline-source'
0
   rdoc.options << '-A cattr_accessor=object'
0
   rdoc.options << '--charset' << 'utf-8'
0
 
0
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
0
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : './doc/template/horo'
0
 
0
   rdoc.rdoc_files.include('railties/CHANGELOG')
0
   rdoc.rdoc_files.include('railties/MIT-LICENSE')
0
@@ -68,13 +68,13 @@ end
0
 
0
 # Enhance rdoc task to copy referenced images also
0
 task :rdoc do
0
-  FileUtils.mkdir_p "doc/files/examples/"
0
-  FileUtils.copy "activerecord/examples/associations.png", "doc/files/examples/associations.png"
0
+  FileUtils.mkdir_p "doc/rdoc/files/examples/"
0
+  FileUtils.copy "activerecord/examples/associations.png", "doc/rdoc/files/examples/associations.png"
0
 end
0
 
0
 desc "Publish API docs for Rails as a whole and for each component"
0
 task :pdoc => :rdoc do
0
-  Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/api", "doc").upload
0
+  Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/api", "doc/rdoc").upload
0
   PROJECTS.each do |project|
0
     system %(cd #{project} && #{env} #{$0} pdoc)
0
   end

0
@@ -35,7 +35,7 @@ Rake::RDocTask.new { |rdoc|
0
   rdoc.title    = "Action Mailer -- Easy email delivery and testing"
0
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
0
   rdoc.options << '--charset' << 'utf-8'
0
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
0
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
0
   rdoc.rdoc_files.include('README', 'CHANGELOG')
0
   rdoc.rdoc_files.include('lib/action_mailer.rb')
0
   rdoc.rdoc_files.include('lib/action_mailer/*.rb')
0
@@ -77,6 +77,7 @@ end
0
 desc "Publish the API documentation"
0
 task :pgem => [:package] do 
0
   Rake::SshFilePublisher.new("wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
0
+  `ssh wrath.rubyonrails.org './gemupdate.sh'`
0
 end
0
 
0
 desc "Publish the API documentation"

0
@@ -49,7 +49,7 @@ Rake::RDocTask.new { |rdoc|
0
   rdoc.title    = "Action Pack -- On rails from request to response"
0
   rdoc.options << '--line-numbers' << '--inline-source'
0
   rdoc.options << '--charset' << 'utf-8'
0
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
0
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
0
   if ENV['DOC_FILES'] 
0
     rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
0
   else

0
@@ -10,7 +10,7 @@ Rake::RDocTask.new { |rdoc|
0
   rdoc.title    = "Active Model"
0
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
0
   rdoc.options << '--charset' << 'utf-8'
0
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
0
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
0
   rdoc.rdoc_files.include('README', 'CHANGES')
0
   rdoc.rdoc_files.include('lib/**/*.rb')
0
-}
0
\ No newline at end of file
0
+}

0
@@ -141,7 +141,7 @@ Rake::RDocTask.new { |rdoc|
0
   rdoc.title    = "Active Record -- Object-relation mapping put on rails"
0
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
0
   rdoc.options << '--charset' << 'utf-8'
0
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
0
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
0
   rdoc.rdoc_files.include('README', 'RUNNING_UNIT_TESTS', 'CHANGELOG')
0
   rdoc.rdoc_files.include('lib/**/*.rb')
0
   rdoc.rdoc_files.exclude('lib/active_record/vendor/*')

0
@@ -42,7 +42,7 @@ Rake::RDocTask.new { |rdoc|
0
   rdoc.title    = "Active Resource -- Object-oriented REST services"
0
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
0
   rdoc.options << '--charset' << 'utf-8'
0
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
0
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
0
   rdoc.rdoc_files.include('README', 'CHANGELOG')
0
   rdoc.rdoc_files.include('lib/**/*.rb')
0
   rdoc.rdoc_files.exclude('lib/activeresource.rb')

0
@@ -33,7 +33,7 @@ Rake::RDocTask.new { |rdoc|
0
   rdoc.title    = "Active Support -- Utility classes and standard library extensions from Rails"
0
   rdoc.options << '--line-numbers' << '--inline-source'
0
   rdoc.options << '--charset' << 'utf-8'
0
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
0
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
0
   rdoc.rdoc_files.include('README', 'CHANGELOG')
0
   rdoc.rdoc_files.include('lib/active_support.rb')
0
   rdoc.rdoc_files.include('lib/active_support/**/*.rb')

0
@@ -264,7 +264,7 @@ Rake::RDocTask.new { |rdoc|
0
   rdoc.title    = "Railties -- Gluing the Engine to the Rails"
0
   rdoc.options << '--line-numbers' << '--inline-source' << '--accessor' << 'cattr_accessor=object'
0
   rdoc.options << '--charset' << 'utf-8'
0
-  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
0
+  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
0
   rdoc.rdoc_files.include('README', 'CHANGELOG')
0
   rdoc.rdoc_files.include('lib/*.rb')
0
   rdoc.rdoc_files.include('lib/rails/*.rb')