diff options
| author | Evan Machnic <emachnic@broadmac.net> | 2011-07-19 14:46:24 -0400 |
|---|---|---|
| committer | Evan Machnic <emachnic@broadmac.net> | 2011-07-19 14:46:24 -0400 |
| commit | f1a239fd6d84f6e55d55411f3ebd77ffd67e664a (patch) | |
| tree | ac8d29255e3f5d2bc29a20578801b217f2082f0c /actionpack | |
| parent | 2f4d9ef34e5c70057a9fe9e96e6b1e45d6341497 (diff) | |
| parent | 46be69a220cf1815320ecdd7595d8fa37dcb5fd5 (diff) | |
| download | rails-f1a239fd6d84f6e55d55411f3ebd77ffd67e664a.tar.gz rails-f1a239fd6d84f6e55d55411f3ebd77ffd67e664a.tar.bz2 rails-f1a239fd6d84f6e55d55411f3ebd77ffd67e664a.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 6 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 0ef84fb0b6..417ba11fd3 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -8,7 +8,7 @@ module ActionView module Helpers # = Action View Date Helpers # - # The Date Helper primarily creates select/option tags for different kinds of dates and times or date and time + # The Date Helper primarily creates select/option tags for different kinds of dates and times or date and time # elements. All of the select-type methods share a number of common options that are as follows: # # * <tt>:prefix</tt> - overwrites the default prefix of "date" used for the select names. So specifying "birthday" @@ -343,8 +343,8 @@ module ActionView # Returns a set of html select-tags (one for year, month, and day) pre-selected with the +date+. # It's possible to explicitly set the order of the tags using the <tt>:order</tt> option with an array of - # symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in the desired order. If you do not supply a symbol - # then all tags will be hidden. + # symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in the desired order. + # If the array passed to the <tt>:order</tt> option does not contain all the three symbols, all tags will be hidden. # # If anything is passed in the html_options hash it will be applied to every select tag in the set. # diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index e730526163..5b41750b52 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -864,7 +864,7 @@ module ActionView # some browsers # # ==== Examples - # + # # search_field(:user, :name) # # => <input id="user_name" name="user[name]" size="30" type="search" /> # search_field(:user, :name, :autosave => false) @@ -900,7 +900,7 @@ module ActionView # Returns a text_field of type "tel". # - # telephone_field("user", "phone") + # telephone_field("user", "phone") # # => <input id="user_phone" name="user[phone]" size="30" type="tel" /> def telephone_field(object_name, method, options = {}) |