From 5aec73daf5ea144ac9f2a4e15c6807cc2dcb87b6 Mon Sep 17 00:00:00 2001
From: Teng Siong Ong <siong1987@gmail.com>
Date: Tue, 30 Apr 2013 06:49:03 -0700
Subject: [PATCH] Make `rake doc:guides` works again.  Fix #10384.

---
 guides/rails_guides.rb                      | 2 +-
 railties/lib/rails/tasks/documentation.rake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/guides/rails_guides.rb b/guides/rails_guides.rb
index ab890f202c1..ce409868caf 100644
--- a/guides/rails_guides.rb
+++ b/guides/rails_guides.rb
@@ -22,7 +22,7 @@ end
 
 begin
   require 'redcarpet'
-rescue Gem::LoadError
+rescue LoadError
   # This can happen if doc:guides is executed in an application.
   $stderr.puts('Generating guides requires Redcarpet 2.1.1+.')
   $stderr.puts(<<ERROR) if bundler?
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 1c3426028d2..f89d6b12e18 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -57,8 +57,8 @@ namespace :doc do
 
   # desc "Generate Rails Guides"
   task :guides do
-    # FIXME: Reaching outside lib directory is a bad idea
-    require File.expand_path('../../../../../guides/rails_guides', __FILE__)
+    rails_gem_dir = Gem::Specification.find_by_name("rails").gem_dir
+    require File.expand_path(File.join(rails_gem_dir, "/guides/rails_guides"))
     RailsGuides::Generator.new(Rails.root.join("doc/guides")).generate
   end
 end