4 files changed, 41 insertions, 9 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 86f62dfb40..94edcd352a 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -634,6 +634,10 @@ module Rails
       end
     end
 
+    def routes? #:nodoc:
+      @routes
+    end
+
     protected
 
     def run_tasks_blocks(*) #:nodoc:
@@ -641,10 +645,6 @@ module Rails
       paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
     end
 
-    def routes? #:nodoc:
-      @routes
-    end
-
     def has_migrations? #:nodoc:
       paths["db/migrate"].existent.any?
     end
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 9437e9c406..2b6ad1ff2d 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -112,7 +112,6 @@ module Rails
   # Be sure to look at the documentation of those specific classes for more information.
   #
   class Railtie
-    autoload :Configurable,  "rails/railtie/configurable"
     autoload :Configuration, "rails/railtie/configuration"
 
     include Initializable
@@ -121,6 +120,7 @@ module Rails
 
     class << self
       private :new
+      delegate :config, to: :instance
 
       def subclasses
         @subclasses ||= []
@@ -128,7 +128,6 @@ module Rails
 
       def inherited(base)
         unless base.abstract_railtie?
-          base.send(:include, Railtie::Configurable)
           subclasses << base
         end
       end
@@ -166,14 +165,47 @@ module Rails
         @railtie_name ||= generate_railtie_name(self.name)
       end
 
+      # Since Rails::Railtie cannot be instantiated, any methods that call
+      # +instance+ are intended to be called only on subclasses of a Railtie.
+      def instance
+        @instance ||= new
+      end
+
+      def respond_to_missing?(*args)
+        instance.respond_to?(*args) || super
+      end
+
+      # Allows you to configure the railtie. This is the same method seen in
+      # Railtie::Configurable, but this module is no longer required for all
+      # subclasses of Railtie so we provide the class method here.
+      def configure(&block)
+        class_eval(&block)
+      end
+
       protected
         def generate_railtie_name(class_or_module)
           ActiveSupport::Inflector.underscore(class_or_module).tr("/", "_")
         end
+
+        # If the class method does not have a method, then send the method call
+        # to the Railtie instance.
+        def method_missing(name, *args, &block)
+          if instance.respond_to?(name)
+            instance.public_send(name, *args, &block)
+          else
+            super
+          end
+        end
     end
 
     delegate :railtie_name, to: :class
 
+    def initialize
+      if self.class.abstract_railtie?
+        raise "#{self.class.name} is abstract, you cannot instantiate it directly."
+      end
+    end
+
     def config
       @config ||= Railtie::Configuration.new
     end
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 1c3426028d..f89d6b12e1 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
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index fee352db5a..dcbf57a4df 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -3,7 +3,7 @@ module Rails
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end