Merge commit 'mainstream/master'

Conflicts:

	actionmailer/lib/action_mailer/base.rb
	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_controller/mime_type.rb
	railties/doc/guides/html/activerecord_validations_callbacks.html
	railties/doc/guides/html/caching_with_rails.html
	railties/doc/guides/html/command_line.html
	railties/doc/guides/html/configuring.html
	railties/doc/guides/html/creating_plugins.html
	railties/doc/guides/html/finders.html
	railties/doc/guides/html/routing_outside_in.html
	railties/doc/guides/source/activerecord_validations_callbacks.txt
	railties/doc/guides/source/caching_with_rails.txt
	railties/doc/guides/source/command_line.txt
	railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt
	railties/doc/guides/source/creating_plugins/controllers.txt
	railties/doc/guides/source/creating_plugins/core_ext.txt
	railties/doc/guides/source/creating_plugins/helpers.txt
	railties/doc/guides/source/creating_plugins/index.txt
	railties/doc/guides/source/creating_plugins/migration_generator.txt
	railties/doc/guides/source/creating_plugins/models.txt
	railties/doc/guides/source/creating_plugins/odds_and_ends.txt
	railties/doc/guides/source/creating_plugins/routes.txt
	railties/doc/guides/source/finders.txt
	railties/doc/guides/source/routing_outside_in.txt
	railties/doc/guides/source/testing_rails_applications.txt

1 files changed, 8 insertions, 8 deletions

diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb
index 4cbd2cca4a..7b6f09ac69 100644
--- a/railties/builtin/rails_info/rails/info.rb
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -20,13 +20,13 @@ module Rails
       rescue Exception
       end
 
-      def components
+      def frameworks
         %w( active_record action_pack active_resource action_mailer active_support )
       end
 
-      def component_version(component)
-        require "#{component}/version"
-        "#{component.classify}::VERSION::STRING".constantize
+      def framework_version(framework)
+        require "#{framework}/version"
+        "#{framework.classify}::VERSION::STRING".constantize
       end
 
       def edge_rails_revision(info = git_info)
@@ -90,11 +90,11 @@ module Rails
       Rails::VERSION::STRING
     end
 
-    # Versions of each Rails component (Active Record, Action Pack,
+    # Versions of each Rails framework (Active Record, Action Pack,
     # Active Resource, Action Mailer, and Active Support).
-    components.each do |component|
-      property "#{component.titlecase} version" do
-        component_version(component)
+    frameworks.each do |framework|
+      property "#{framework.titlecase} version" do
+        framework_version(framework)
       end
     end