Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/CHANGELOG

5 files changed, 10 insertions, 9 deletions

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 7c26234750..50bba22a3a 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -252,12 +252,12 @@ module Rails
   #   end
   #
   # The routes above will automatically point to <tt>MyEngine::ApplicationContoller</tt>. Furthermore, you don't
-  # need to use longer url helpers like <tt>my_engine_articles_path</tt>. Instead, you shuold simply use
+  # need to use longer url helpers like <tt>my_engine_articles_path</tt>. Instead, you should simply use
   # <tt>articles_path</tt> as you would do with your application.
   #
   # To make that behaviour consistent with other parts of the framework, an isolated engine also has influence on
   # <tt>ActiveModel::Naming</tt>. When you use a namespaced model, like <tt>MyEngine::Article</tt>, it will normally
-  # use the prefix "my_engine". In an isolated engine, the prefix will be ommited in url helpers and
+  # use the prefix "my_engine". In an isolated engine, the prefix will be omitted in url helpers and
   # form fields for convenience.
   #
   #   polymorphic_url(MyEngine::Article.new) #=> "articles_path"
@@ -266,7 +266,7 @@ module Rails
   #     text_field :title #=> <input type="text" name="article[title]" id="article_title" />
   #   end
   #
-  # Additionaly isolated engine will set its name according to namespace, so
+  # Additionally isolated engine will set its name according to namespace, so
   # MyEngine::Engine.engine_name #=> "my_engine". It will also set MyEngine.table_name_prefix
   # to "my_engine_", changing MyEngine::Article model to use my_engine_article table.
   #
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index d7a86a5c40..c323df3e95 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -264,17 +264,18 @@ module Rails
       #   readme "README"
       #
       def readme(path)
-        say File.read(find_in_source_paths(path))
+        log File.read(find_in_source_paths(path))
       end
 
       protected
 
         # Define log for backwards compatibility. If just one argument is sent,
-        # invoke say, otherwise invoke say_status.
+        # invoke say, otherwise invoke say_status. Differently from say and
+        # similarly to say_status, this method respects the quiet? option given.
         #
         def log(*args)
           if args.size == 1
-            say args.first.to_s
+            say args.first.to_s unless options.quiet?
           else
             args << (self.behavior == :invoke ? :green : :red)
             say_status *args
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
index 791b901593..dcd3b276e3 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
@@ -1,4 +1,4 @@
-# Configure Rails Envinronment
+# Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index d6ccfc496a..de01c858dd 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -53,7 +53,7 @@ module Rails
           @controller_i18n_scope ||= controller_file_path.gsub('/', '.')
         end
 
-        # Loads the ORM::Generators::ActiveModel class. This class is responsable
+        # Loads the ORM::Generators::ActiveModel class. This class is responsible
         # to tell scaffold entities how to generate an specific method for the
         # ORM. Check Rails::Generators::ActiveModel for more information.
         def orm_class
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index afeceafb67..e4368866a1 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -18,7 +18,7 @@ module Rails
 
       # This allows you to modify application's generators from Railties.
       #
-      # Values set on app_generators will become defaults for applicaiton, unless
+      # Values set on app_generators will become defaults for application, unless
       # application overwrites them.
       def app_generators
         @@app_generators ||= Rails::Configuration::Generators.new