diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-15 22:23:40 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-15 22:23:40 +0200 |
| commit | dde82a44d702f8416905476bbea5842157d6a508 (patch) | |
| tree | a568cffc0771407febf7867564853efa481c4764 | |
| parent | 34482882285070391bca6083279702280572ee44 (diff) | |
| parent | 6bd99ecb629807fe940e9f8a2e67d1fb51c800ea (diff) | |
| download | rails-dde82a44d702f8416905476bbea5842157d6a508.tar.gz rails-dde82a44d702f8416905476bbea5842157d6a508.tar.bz2 rails-dde82a44d702f8416905476bbea5842157d6a508.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
| -rw-r--r-- | actionpack/lib/action_view/helpers/date_helper.rb | 8 | ||||
| -rw-r--r-- | railties/guides/source/getting_started.textile | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb index 853ab061d2..c78c03a5eb 100644 --- a/actionpack/lib/action_view/helpers/date_helper.rb +++ b/actionpack/lib/action_view/helpers/date_helper.rb @@ -841,14 +841,14 @@ module ActionView # Build select option html from date value and options. # build_options(15, :start => 1, :end => 31) # => "<option value="1">1</option> - # <option value=\"2\">2</option> - # <option value=\"3\">3</option>..." + # <option value="2">2</option> + # <option value="3">3</option>..." # # If <tt>:step</tt> options is passed # build_options(15, :start => 1, :end => 31, :step => 2) # => "<option value="1">1</option> - # <option value=\"3\">3</option> - # <option value=\"5\">5</option>..." + # <option value="3">3</option> + # <option value="5">5</option>..." def build_options(selected, options = {}) start = options.delete(:start) || 0 stop = options.delete(:end) || 59 diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile index a826a33120..1c66115d44 100644 --- a/railties/guides/source/getting_started.textile +++ b/railties/guides/source/getting_started.textile @@ -1450,14 +1450,14 @@ Two very common sources of data that are not UTF-8: h3. Changelog -* April 26, 2011: Changed migration code from +up+, +down+ pair to +change+ method "Prem Sichanugrist":"http://sikachu.com" -* April 11, 2011: Changed scaffold_controller generator to create format block for JSON instead of XML "Sebastian Martinez":http://www.wyeworks.com +* April 26, 2011: Change migration code from +up+, +down+ pair to +change+ method by "Prem Sichanugrist":http://sikachu.com +* April 11, 2011: Change scaffold_controller generator to create format block for JSON instead of XML by "Sebastian Martinez":http://www.wyeworks.com * August 30, 2010: Minor editing after Rails 3 release by "Joost Baaij":http://www.spacebabies.nl * July 12, 2010: Fixes, editing and updating of code samples by "Jaime Iniesta":http://jaimeiniesta.com * May 16, 2010: Added a section on configuration gotchas to address common encoding problems that people might have by "Yehuda Katz":http://www.yehudakatz.com * April 30, 2010: Fixes, editing and updating of code samples by "Rohit Arondekar":http://rohitarondekar.com -* April 25, 2010: Couple of more minor fixups "Mikel Lindsaar":credits.html#raasdnil -* April 1, 2010: Fixed document to validate XHTML 1.0 Strict. "Jaime Iniesta":http://jaimeiniesta.com +* April 25, 2010: Couple of more minor fixups by "Mikel Lindsaar":credits.html#raasdnil +* April 1, 2010: Fixed document to validate XHTML 1.0 Strict by "Jaime Iniesta":http://jaimeiniesta.com * February 8, 2010: Full re-write for Rails 3.0-beta, added helpers and before_filters, refactored code by "Mikel Lindsaar":credits.html#raasdnil * January 24, 2010: Re-write for Rails 3.0 by "Mikel Lindsaar":credits.html#raasdnil * July 18, 2009: Minor cleanup in anticipation of Rails 2.3.3 by "Mike Gunderloy":credits.html#mgunderloy |