From f817bb2c485d7363be104fd8a00b28c36a0adefc Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Wed, 2 Jan 2013 06:52:15 +0900
Subject: s/ERb/ERB/

---
 actionpack/lib/action_view/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 668515df59..08253de3f4 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -6,7 +6,7 @@ require 'action_view/log_subscriber'
 module ActionView #:nodoc:
   # = Action View Base
   #
-  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERb
+  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERB
   # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> extension then Jim Weirich's Builder::XmlMarkup library is used.
   #
   # == ERB
-- 
cgit v1.2.3


From 79255fab894e44b1daa943a151eadcefbe97526a Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Thu, 3 Jan 2013 22:34:11 +0900
Subject: PUT => PATCH

---
 actionpack/lib/action_view/helpers/form_helper.rb     | 8 ++++----
 actionpack/lib/action_view/helpers/form_tag_helper.rb | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 516492ca30..b10d927e20 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -84,7 +84,7 @@ module ActionView
     #
     #   <form action="/people/256" class="edit_person" id="edit_person_256" method="post">
     #     <div style="margin:0;padding:0;display:inline">
-    #       <input name="_method" type="hidden" value="put" />
+    #       <input name="_method" type="hidden" value="patch" />
     #       <input name="authenticity_token" type="hidden" value="NrOp5bsjoLRuK8IW5+dQEYjKGUJDe7TQoZVvq95Wteg=" />
     #     </div>
     #     <label for="person_first_name">First name</label>:
@@ -242,7 +242,7 @@ module ActionView
       #
       # is then equivalent to something like:
       #
-      #   <%= form_for @post, as: :post, url: post_path(@post), method: :put, html: { class: "edit_post", id: "edit_post_45" } do |f| %>
+      #   <%= form_for @post, as: :post, url: post_path(@post), method: :patch, html: { class: "edit_post", id: "edit_post_45" } do |f| %>
       #     ...
       #   <% end %>
       #
@@ -318,7 +318,7 @@ module ActionView
       #
       #   <form action='http://www.example.com' method='post' data-remote='true'>
       #     <div style='margin:0;padding:0;display:inline'>
-      #       <input name='_method' type='hidden' value='put' />
+      #       <input name='_method' type='hidden' value='patch' />
       #     </div>
       #     ...
       #   </form>
@@ -336,7 +336,7 @@ module ActionView
       #
       #   <form action='http://www.example.com' method='post' data-behavior='autosave' name='go'>
       #     <div style='margin:0;padding:0;display:inline'>
-      #       <input name='_method' type='hidden' value='put' />
+      #       <input name='_method' type='hidden' value='patch' />
       #     </div>
       #     ...
       #   </form>
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index ff83ef3ca1..547b61defd 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -26,7 +26,7 @@ module ActionView
       # ==== Options
       # * <tt>:multipart</tt> - If set to true, the enctype is set to "multipart/form-data".
       # * <tt>:method</tt> - The method to use when submitting the form, usually either "get" or "post".
-      #   If "put", "delete", or another verb is used, a hidden input with name <tt>_method</tt>
+      #   If "patch", "put", "delete", or another verb is used, a hidden input with name <tt>_method</tt>
       #   is added to simulate the verb over post.
       # * <tt>:authenticity_token</tt> - Authenticity token to use in the form. Use only if you need to
       #   pass custom authenticity token string, or to not add authenticity_token field at all
-- 
cgit v1.2.3


From 1a59a6dfdca217e31a52779d92aa56b67c6689cb Mon Sep 17 00:00:00 2001
From: Gosha Arinich <me@goshakkk.name>
Date: Fri, 4 Jan 2013 02:57:56 +0300
Subject: TODO typo fix

---
 actionpack/lib/action_view/renderer/streaming_template_renderer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
index 9cf6eb0c65..01f1367c69 100644
--- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -28,7 +28,7 @@ module ActionView
       private
 
       # This is the same logging logic as in ShowExceptions middleware.
-      # TODO Once "exceptron" is in, refactor this piece to simply re-use exceptron.
+      # TODO Once "exception" is in, refactor this piece to simply re-use exception.
       def log_error(exception) #:nodoc:
         logger = ActionView::Base.logger
         return unless logger
-- 
cgit v1.2.3


From 034982ef2237dea5bf3576aeba10c6f24be8e501 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Fri, 4 Jan 2013 09:06:40 +0900
Subject: Revert "TODO typo fix"

This reverts commit 1a59a6dfdca217e31a52779d92aa56b67c6689cb.

I guess it's not a typo: https://github.com/jorlhuda/exceptron
---
 actionpack/lib/action_view/renderer/streaming_template_renderer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
index 01f1367c69..9cf6eb0c65 100644
--- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -28,7 +28,7 @@ module ActionView
       private
 
       # This is the same logging logic as in ShowExceptions middleware.
-      # TODO Once "exception" is in, refactor this piece to simply re-use exception.
+      # TODO Once "exceptron" is in, refactor this piece to simply re-use exceptron.
       def log_error(exception) #:nodoc:
         logger = ActionView::Base.logger
         return unless logger
-- 
cgit v1.2.3