Merge docrails

1 files changed, 15 insertions, 7 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index ec2fe850e6..8de7e24738 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -277,14 +277,19 @@ Rake::RDocTask.new { |rdoc|
 # doesn't equal its folder name, then specify a hash: { 'folder_name' => 'basename' }
 guides = [
   'getting_started_with_rails',
-  'securing_rails_applications',
-  'testing_rails_applications',
+   # 'testing_rails_applications',
   'creating_plugins',
+  'actioncontroller',
   'migrations',
+  { 'securing_rails_applications' => 'security' },
   { 'routing' => 'routing_outside_in' },
   { 'forms' =>'form_helpers' },
   { 'activerecord' => 'association_basics' },
-  { 'debugging' => 'debugging_rails_applications' }
+  { 'activerecord' => 'finders' },
+  { 'debugging' => 'debugging_rails_applications' },
+  { 'caching' => 'caching_with_rails' },
+  { 'benchmarking_and_profiling' => 'preamble' },
+  { 'actionview' => 'layouts_and_rendering' }
 ]
 
 guides_html_files = []  # autogenerated from the 'guides' variable.
@@ -306,15 +311,18 @@ guides.each do |entry|
   end
 end
 
-task 'doc/guides/index.html' => 'doc/guides/index.txt' do
-  ENV.delete('MANUALSONRAILS_INDEX_URL')
-  ENV['MANUALSONRAILS_TOC'] = 'no'
-  sh "mizuho", 'doc/guides/index.txt', "--template", "manualsonrails", "--icons-dir", "icons"
+['index', 'authors'].each do |guide|
+  task "doc/guides/#{guide}.html" => "doc/guides/#{guide}.txt" do
+    ENV.delete('MANUALSONRAILS_INDEX_URL')
+    ENV['MANUALSONRAILS_TOC'] = 'no'
+    sh "mizuho", "doc/guides/#{guide}.txt", "--template", "manualsonrails", "--icons-dir", "icons"
+  end
 end
 
 desc "Generate HTML output for the guides"
 task :generate_guides => guides_html_files
 task :generate_guides => 'doc/guides/index.html'
+task :generate_guides => 'doc/guides/authors.html'
 
 # Generate GEM ----------------------------------------------------------------------------