diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-10-14 23:15:23 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-10-14 23:15:23 +0200 |
| commit | 13f7f89bda503ccb1abc8dc78fbe36c44d902c49 (patch) | |
| tree | 5359a0c9b0d21e4b1b2e44239db6457b6e21c4e5 /activesupport/lib/active_support | |
| parent | 01ab6f961bff150d50c99f03fa3946f48ac29b17 (diff) | |
| parent | cfb1ba023b11f82d776f9744ddbe7c826c8d7fbc (diff) | |
| download | rails-13f7f89bda503ccb1abc8dc78fbe36c44d902c49.tar.gz rails-13f7f89bda503ccb1abc8dc78fbe36c44d902c49.tar.bz2 rails-13f7f89bda503ccb1abc8dc78fbe36c44d902c49.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index 025c619783..d4ae3131ec 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -19,8 +19,8 @@ class Time # # time = Time.now # => Thu Jan 18 06:10:17 CST 2007 # - # time.to_formatted_s(:time) # => "06:10:17" - # time.to_s(:time) # => "06:10:17" + # time.to_formatted_s(:time) # => "06:10" + # time.to_s(:time) # => "06:10" # # time.to_formatted_s(:db) # => "2007-01-18 06:10:17" # time.to_formatted_s(:number) # => "20070118061017" |