4 files changed, 58 insertions, 5 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 7a1bb1e25c..1e4c6ca921 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -25,9 +25,11 @@ module Rails
             get '/rails/info/properties' => "rails/info#properties"
             get '/rails/info/routes'     => "rails/info#routes"
             get '/rails/info'            => "rails/info#index"
-            get '/'                      => "rails/welcome#index"
           end
         end
+        app.routes.append do
+          get '/' => "rails/welcome#index"
+        end
       end
 
       initializer :build_middleware_stack do
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
index 230d3d9d04..b775f1ff8d 100644
--- a/railties/lib/rails/console/helpers.rb
+++ b/railties/lib/rails/console/helpers.rb
@@ -1,9 +1,15 @@
 module Rails
   module ConsoleMethods
+    # Gets the helper methods available to the controller.
+    #
+    # This method assumes an +ApplicationController+ exists, and it extends +ActionController::Base+
     def helper
       @helper ||= ApplicationController.helpers
     end
 
+    # Gets a new instance of a controller object.
+    #
+    # This method assumes an +ApplicationController+ exists, and it extends +ActionController::Base+
     def controller
       @controller ||= ApplicationController.new
     end
diff --git a/railties/lib/rails/templates/rails/welcome/index.html.erb b/railties/lib/rails/templates/rails/welcome/index.html.erb
index 4c4c80ecda..dd35835c6f 100644
--- a/railties/lib/rails/templates/rails/welcome/index.html.erb
+++ b/railties/lib/rails/templates/rails/welcome/index.html.erb
@@ -227,13 +227,13 @@
 
             <li>
               <h2>Set up a root route to replace this page</h2>
-              <p>You're seeing this page because you're running in development mode and you haven't set a root route yet.</p>
+              <p>You're seeing this page because you haven't set a root route yet.</p>
               <p>Routes are set up in <span class="filename">config/routes.rb</span>.</p>
             </li>
 
             <li>
-              <h2>Create your database</h2>
-              <p>Run <code>rake db:create</code> to create your database. If you're not using SQLite (the default), edit <span class="filename">config/database.yml</span> with your username and password.</p>
+              <h2>Configure your database</h2>
+              <p>If you're not using SQLite (the default), edit <span class="filename">config/database.yml</span> with your username and password.</p>
             </li>
           </ol>
         </div>
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 1a4e2d4123..e1679315f8 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -60,7 +60,7 @@ module ApplicationTests
     test "rails/welcome in production" do
       app("production")
       get "/"
-      assert_equal 404, last_response.status
+      assert_equal 200, last_response.status
     end
 
     test "rails/info/routes in production" do
@@ -372,6 +372,51 @@ module ApplicationTests
       end
     end
 
+    test 'named routes are cleared when reloading' do
+      app('development')
+
+      controller :foo, <<-RUBY
+        class FooController < ApplicationController
+          def index
+            render text: "foo"
+          end
+        end
+      RUBY
+
+      controller :bar, <<-RUBY
+        class BarController < ApplicationController
+          def index
+            render text: "bar"
+          end
+        end
+      RUBY
+
+      app_file 'config/routes.rb', <<-RUBY
+        Rails.application.routes.draw do
+          get ':locale/foo', to: 'foo#index', as: 'foo'
+        end
+      RUBY
+
+      get '/en/foo'
+      assert_equal 'foo', last_response.body
+      assert_equal '/en/foo', Rails.application.routes.url_helpers.foo_path(:locale => 'en')
+
+      app_file 'config/routes.rb', <<-RUBY
+        Rails.application.routes.draw do
+          get ':locale/bar', to: 'bar#index', as: 'foo'
+        end
+      RUBY
+
+      Rails.application.reload_routes!
+
+      get '/en/foo'
+      assert_equal 404, last_response.status
+
+      get '/en/bar'
+      assert_equal 'bar', last_response.body
+      assert_equal '/en/bar', Rails.application.routes.url_helpers.foo_path(:locale => 'en')
+    end
+
     test 'resource routing with irregular inflection' do
       app_file 'config/initializers/inflection.rb', <<-RUBY
         ActiveSupport::Inflector.inflections do |inflect|