7 files changed, 17 insertions, 23 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 25cdd75cd9..0ae2f16aba 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -175,7 +175,7 @@ module Rails
   # There are some places where an Engine's name is used:
   #
   # * routes: when you mount an Engine with <tt>mount(MyEngine::Engine => '/my_engine')</tt>,
-  #   it's used as default :as option
+  #   it's used as default <tt>:as</tt> option
   # * rake task for installing migrations <tt>my_engine:install:migrations</tt>
   #
   # Engine name is set by default based on class name. For <tt>MyEngine::Engine</tt> it will be
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index 71cb0b903b..cb3aca5811 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -4,6 +4,10 @@ require 'rbconfig'
 module Rails
   module Generators
     module Actions
+      def initialize(*) # :nodoc:
+        super
+        @in_group = nil
+      end
 
       # Adds an entry into Gemfile for the supplied gem.
       #
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index bf60616e2b..784c97aee0 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -38,7 +38,7 @@ module Rails
     end
 
     def readme
-      copy_file "README", "README.rdoc"
+      copy_file "README.rdoc", "README.rdoc"
     end
 
     def gemfile
diff --git a/railties/lib/rails/generators/rails/app/templates/README b/railties/lib/rails/generators/rails/app/templates/README.rdoc
index 8d1b0f42e5..dd4e97e22e 100644
--- a/railties/lib/rails/generators/rails/app/templates/README
+++ b/railties/lib/rails/generators/rails/app/templates/README.rdoc
@@ -23,6 +23,6 @@ Things you may want to cover:
 
 * ...
 
-If you plan to generate application documentation with `rake doc:app` this file
-is expected to be `README.rdoc`, otherwise please feel free to rename it and use
-a different markup language.
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index e52d1a8b90..de6795eda2 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -55,8 +55,8 @@ module Rails
         add(path, with: value, glob: glob)
       end
 
-      def add(path, options={})
-        with = Array(options[:with] || path)
+      def add(path, options = {})
+        with = Array(options.fetch(:with, path))
         @root[path] = Path.new(self, path, with, options)
       end
 
@@ -189,9 +189,9 @@ module Rails
           path = File.expand_path(p, @root.path)
 
           if @glob && File.directory?(path)
-            result.concat Dir.chdir(path) {
-              Dir.glob(@glob).map { |file| File.join path, file }.sort
-            }
+            Dir.chdir(path) do
+              result.concat(Dir.glob(@glob).map { |file| File.join path, file }.sort)
+            end
           else
             result << path
           end
diff --git a/railties/lib/rails/templates/rails/welcome/index.html.erb b/railties/lib/rails/templates/rails/welcome/index.html.erb
index abe705618a..e239e1695e 100644
--- a/railties/lib/rails/templates/rails/welcome/index.html.erb
+++ b/railties/lib/rails/templates/rails/welcome/index.html.erb
@@ -59,7 +59,7 @@
 
 
       #header {
-        background-image: url("assets/rails.png");
+        background-image: url("/assets/rails.png");
         background-repeat: no-repeat;
         background-position: top left;
         height: 64px;
@@ -178,7 +178,7 @@
 
         if (info.innerHTML === '') {
           xhr = new XMLHttpRequest();
-          xhr.open("GET", "rails/info/properties", false);
+          xhr.open("GET", "/rails/info/properties", false);
           xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
           xhr.send("");
           info.innerHTML = xhr.responseText;
@@ -211,7 +211,7 @@
         </div>
 
         <div id="about">
-          <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
+          <h3><a href="/rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
           <div id="about-content" style="display: none"></div>
         </div>
 
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 616206dd0b..739e4ad992 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -11,16 +11,6 @@ require 'action_dispatch/testing/integration'
 require 'rails/backtrace_cleaner'
 MiniTest.backtrace_filter = Rails.backtrace_cleaner
 
-# Enable turn if it is available
-begin
-  require 'turn'
-
-  Turn.config do |c|
-    c.natural = true
-  end
-rescue LoadError
-end
-
 if defined?(ActiveRecord::Base)
   class ActiveSupport::TestCase
     include ActiveRecord::TestFixtures