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

3 files changed, 8 insertions, 8 deletions

diff --git a/actionpack/README.rdoc b/actionpack/README.rdoc
index 076a93bbcd..1fdc57e14d 100644
--- a/actionpack/README.rdoc
+++ b/actionpack/README.rdoc
@@ -218,7 +218,7 @@ A short rundown of some of the major features:
 
       def show
         # the output of the method will be cached as
-        # ActionController::Base.page_cache_directory + "/weblog/show/n.html"
+        # ActionController::Base.page_cache_directory + "/weblog/show.html"
         # and the web server will pick it up without even hitting Rails
       end
 
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index fd6a46fbec..3d915cf513 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -42,8 +42,8 @@ module AbstractController
         controller.public_instance_methods(true)
       end
 
-      # The list of hidden actions to an empty array. Defaults to an
-      # empty array. This can be modified by other modules or subclasses
+      # The list of hidden actions. Defaults to an empty array.
+      # This can be modified by other modules or subclasses
       # to specify particular actions as hidden.
       #
       # ==== Returns
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 44e24fecd1..cae345a1d6 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1102,14 +1102,14 @@ module ActionView
       #   <% end %>
       #
       # In the example above, if @post is a new record, it will use "Create Post" as
-      # submit button label, otherwise, it uses "Update Post".
+      # button label, otherwise, it uses "Update Post".
       #
-      # Those labels can be customized using I18n, under the helpers.submit key and accept
-      # the %{model} as translation interpolation:
+      # Those labels can be customized using I18n, under the helpers.submit key
+      # (the same as submit helper) and accept the %{model} as translation interpolation:
       #
       #   en:
       #     helpers:
-      #       button:
+      #       submit:
       #         create: "Create a %{model}"
       #         update: "Confirm changes to %{model}"
       #
@@ -1117,7 +1117,7 @@ module ActionView
       #
       #   en:
       #     helpers:
-      #       button:
+      #       submit:
       #         post:
       #           create: "Add %{model}"
       #