diff options
| author | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-09 01:38:17 +0100 |
|---|---|---|
| committer | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-09 01:38:17 +0100 |
| commit | 13c6c3cfc59ff0b400b294dce15f32752b0fb5f5 (patch) | |
| tree | 052ac9c8f4adb91a4b32e3b2a97b1bc6bdace2e6 /railties/Rakefile | |
| parent | ccb96f2297e8783165cba764e9b5d51e1a15ff87 (diff) | |
| parent | 4e60eebae05aeec65e4894e3901c9d61c9b32910 (diff) | |
| download | rails-13c6c3cfc59ff0b400b294dce15f32752b0fb5f5.tar.gz rails-13c6c3cfc59ff0b400b294dce15f32752b0fb5f5.tar.bz2 rails-13c6c3cfc59ff0b400b294dce15f32752b0fb5f5.zip | |
Merge commit 'origin/master' into savepoints
Diffstat (limited to 'railties/Rakefile')
| -rw-r--r-- | railties/Rakefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index f812b42f1d..692c96ddbb 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -282,6 +282,7 @@ task :guides do FileUtils.mkdir(html) template = File.expand_path("doc/guides/source/templates/guides.html.erb") + asciidoc_conf = 'doc/guides/asciidoc.conf' ignore = ['..', 'icons', 'images', 'templates', 'stylesheets'] ignore << 'active_record_basics.txt' @@ -311,7 +312,7 @@ task :guides do begin puts "GENERATING => #{output}" ENV['MANUALSONRAILS_TOC'] = 'no' if indexless.include?(entry) - Mizuho::Generator.new(input, :output => output, :template => template).start + Mizuho::Generator.new(input, :output => output, :template => template, :conf_file => asciidoc_conf).start rescue Mizuho::GenerationError STDERR.puts "*** ERROR" exit 2 |