aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/form_helper.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-07-24 21:02:51 +0200
committerXavier Noria <fxn@hashref.com>2011-07-24 21:02:51 +0200
commit4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364 (patch)
treed2bd733be55a75d5aab8fbcfc4adbb83034980bc /actionpack/lib/action_view/helpers/form_helper.rb
parent97716e6273018c5531c7c927d226af823a0a3820 (diff)
parent0626668374d092a3cf72b16fe24944beffddf804 (diff)
downloadrails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.gz
rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.bz2
rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 724fe7a518..974c963d44 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -259,8 +259,8 @@ module ActionView
# :remote => true
#
# in the options hash creates a form that will allow the unobtrusive JavaScript drivers to modify its
- # behaviour. The expected default behaviour is an XMLHttpRequest in the background instead of the regular
- # POST arrangement, but ultimately the behaviour is the choice of the JavaScript driver implementor.
+ # behavior. The expected default behavior is an XMLHttpRequest in the background instead of the regular
+ # POST arrangement, but ultimately the behavior is the choice of the JavaScript driver implementor.
# Even though it's using JavaScript to serialize the form elements, the form submission will work just like
# a regular submission as viewed by the receiving side (all elements available in <tt>params</tt>).
#