aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 62feda696b..46986d07e9 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix typo left over from previous typo fix in url helper. Closes #9414 [Henrik N]
+
* Fixed that ActionController::CgiRequest#host_with_port() should handle standard port #10082 [moro]
* Update Prototype to 1.6.0 and script.aculo.us to 1.8.0. [sam, madrobby]
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 77201de1d6..ddd09de352 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -104,7 +104,7 @@ module ActionView
# in dangerous actions like deleting a record (which search bots can follow
# while spidering your site). Supported verbs are :post, :delete and :put.
# Note that if the user has JavaScript disabled, the request will fall back
- # to using GET. If you are relying on the POST behavior, your should check
+ # to using GET. If you are relying on the POST behavior, you should check
# for it in your controller's action by using the request object's methods
# for post?, delete? or put?.
# * The +html_options+ will accept a hash of html attributes for the link tag.