aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-09-03 21:30:22 +0200
committerXavier Noria <fxn@hashref.com>2010-09-03 21:30:22 +0200
commit93acbf6bf31ca1802d7631c57da693a824456c4a (patch)
tree0c2be6d2c127abf50572dc86bf7dc182c00bb49c /actionpack
parentd28438caf2342be3df8421ed92b95e0510be8ac0 (diff)
parentf8fb4651a7d8218befce48d66f4fadcea6ece37a (diff)
downloadrails-93acbf6bf31ca1802d7631c57da693a824456c4a.tar.gz
rails-93acbf6bf31ca1802d7631c57da693a824456c4a.tar.bz2
rails-93acbf6bf31ca1802d7631c57da693a824456c4a.zip
Merge remote branch 'docrails/master'
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 853ec70392..b8df2d9a69 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -13,7 +13,7 @@ module ActionView
module UrlHelper
# This helper may be included in any class that includes the
# URL helpers of a routes (routes.url_helpers). Some methods
- # provided here will only work in the4 context of a request
+ # provided here will only work in the context of a request
# (link_to_unless_current, for instance), which must be provided
# as a method called #request on the context.