aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-09-01 00:01:26 +0200
committerXavier Noria <fxn@hashref.com>2010-09-01 00:01:26 +0200
commit8b2e4fddbf7e9d204579cd87ac72f14bc592d5a5 (patch)
treea43229c787ba70c08b87283dde7dbf781fbdaea4 /actionpack
parentdb6190a0226b5e702efe04521a27d586585070b9 (diff)
parent28474a7571b6a72f4a9433edf7c5212cf90c3938 (diff)
downloadrails-8b2e4fddbf7e9d204579cd87ac72f14bc592d5a5.tar.gz
rails-8b2e4fddbf7e9d204579cd87ac72f14bc592d5a5.tar.bz2
rails-8b2e4fddbf7e9d204579cd87ac72f14bc592d5a5.zip
Merge remote branch 'docrails/master'
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index b0401c9859..56b38b57f4 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -269,8 +269,9 @@ module ActionView
# The +options+ hash accepts the same options as url_for.
#
# There are a few special +html_options+:
- # * <tt>:method</tt> - Specifies the anchor name to be appended to the path.
- # * <tt>:disabled</tt> - Specifies the anchor name to be appended to the path.
+ # * <tt>:method</tt> - Symbol of HTTP verb. Supported verbs are <tt>:post</tt>, <tt>:get</tt>,
+ # <tt>:delete</tt> and <tt>:put</tt>. By default it will be <tt>:post</tt>.
+ # * <tt>:disabled</tt> - If set to true, it will generate a disabled button.
# * <tt>:confirm</tt> - This will use the unobtrusive JavaScript driver to
# prompt with the question specified. If the user accepts, the link is
# processed normally, otherwise no action is taken.