diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-09-17 13:59:45 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-09-17 13:59:45 -0700 |
| commit | 5f34f12977852ada2186ea451663e98b0f9a8d28 (patch) | |
| tree | 35b41a14bcc2d59643d86dcd2e4049e1c225a6bb /guides/rails_guides.rb | |
| parent | a95ddf647580a8cb9347e557b4468c55d81fd026 (diff) | |
| parent | 1fa5c3b39f5d0bb23c8c3d60b023613386629946 (diff) | |
| download | rails-5f34f12977852ada2186ea451663e98b0f9a8d28.tar.gz rails-5f34f12977852ada2186ea451663e98b0f9a8d28.tar.bz2 rails-5f34f12977852ada2186ea451663e98b0f9a8d28.zip | |
Merge pull request #7663 from sikachu/master-guide-markdown
Convert all the guides into GFM
Diffstat (limited to 'guides/rails_guides.rb')
| -rw-r--r-- | guides/rails_guides.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/guides/rails_guides.rb b/guides/rails_guides.rb index 1955309865..ab890f202c 100644 --- a/guides/rails_guides.rb +++ b/guides/rails_guides.rb @@ -21,14 +21,14 @@ rescue LoadError end begin - require 'redcloth' + require 'redcarpet' rescue Gem::LoadError # This can happen if doc:guides is executed in an application. - $stderr.puts('Generating guides requires RedCloth 4.1.1+.') + $stderr.puts('Generating guides requires Redcarpet 2.1.1+.') $stderr.puts(<<ERROR) if bundler? Please add - gem 'RedCloth', '~> 4.2' + gem 'redcarpet', '~> 2.1.1' to the Gemfile, run @@ -36,12 +36,9 @@ to the Gemfile, run and try again. ERROR - exit 1 end -require "rails_guides/textile_extensions" -RedCloth.send(:include, RailsGuides::TextileExtensions) - +require 'rails_guides/markdown' require "rails_guides/generator" RailsGuides::Generator.new.generate |