Merge branch 'master' of github.com:lifo/docrails

7 files changed, 9 insertions, 9 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index c14393dda7..1bd4572a47 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -67,7 +67,7 @@ end
 require 'action_view'
 require 'action_controller/vendor/html-scanner'
 
-# Common ActiveSupport usage in ActionController
+# Common Active Support usage in Action Controller
 require 'active_support/concern'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/load_error'
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index ba38b186d6..b2c119d7e4 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -2,7 +2,7 @@ require 'abstract_controller/logger'
 
 module ActionController
   # Adds instrumentation to several ends in ActionController::Base. It also provides
-  # some hooks related with process_action, this allows an ORM like ActiveRecord
+  # some hooks related with process_action, this allows an ORM like Active Record
   # and/or DataMapper to plug in ActionController and show related information.
   #
   # Check ActiveRecord::Railties::ControllerRuntime for an example.
diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb
index 61d2e702a7..88efd4b34f 100644
--- a/actionpack/lib/action_view/context.rb
+++ b/actionpack/lib/action_view/context.rb
@@ -3,8 +3,8 @@ module ActionView
     # holds compiled template code
   end
 
-  # ActionView contexts are supplied to ActionController
-  # to render template. The default ActionView context
+  # Action View contexts are supplied to Action Controller
+  # to render template. The default Action View context
   # is ActionView::Base.
   #
   # In order to work with ActionController, a Context
@@ -21,7 +21,7 @@ module ActionView
   #   options<Hash>:: See _render_template_with_layout in ActionView::Base
   #   partial<Boolean>:: Whether or not the template to render is a partial
   #
-  # An ActionView context can also mix in ActionView's
+  # An Action View context can also mix in Action View's
   # helpers. In order to mix in helpers, a context must
   # implement:
   #
diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index 28e40f8560..f173523f6a 100644
--- a/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -4,7 +4,7 @@ require 'action_view/helpers/tag_helper'
 module ActionView
   module Helpers #:nodoc:
     # The SanitizeHelper module provides a set of methods for scrubbing text of undesired HTML elements.
-    # These helper methods extend ActionView making them callable within your template files.
+    # These helper methods extend Action View making them callable within your template files.
     module SanitizeHelper
       # This +sanitize+ helper will html encode all tags and strip all attributes that aren't specifically allowed.
       # It also strips href/src tags with invalid protocols, like javascript: especially.  It does its best to counter any
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 2ca1362aea..3b37fd6b57 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -6,7 +6,7 @@ module ActionView
   module Helpers #:nodoc:
     # The TextHelper module provides a set of methods for filtering, formatting
     # and transforming strings, which can reduce the amount of inline Ruby code in
-    # your views. These helper methods extend ActionView making them callable
+    # your views. These helper methods extend Action View making them callable
     # within your template files.
     module TextHelper
       # The preferred method of outputting text in your views is to use the
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index 75a96d6497..c9a6e5dd45 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -122,7 +122,7 @@ class HelperTest < ActiveSupport::TestCase
   def test_helper_proxy
     methods = AllHelpersController.helpers.methods.map(&:to_s)
 
-    # ActionView
+    # Action View
     assert methods.include?('pluralize')
 
     # abc_helper.rb
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 2b1f2a27df..e3ed097c67 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -275,7 +275,7 @@ class TestController < ActionController::Base
     render :action => "hello", :layout => "layouts/builder"
   end
 
-  # :move: test this in ActionView
+  # :move: test this in Action View
   def builder_partial_test
     render :action => "hello_world_container"
   end