diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-13 18:39:36 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-13 18:39:36 +0530 |
| commit | 23fc5fe0e258414f8ac5fe53a297d312d6820462 (patch) | |
| tree | 541cfa60206cce765d607e1c1980a5fd1d98926f /activesupport | |
| parent | ae04fbfee961a7e6b90a3373dc305f100e50614f (diff) | |
| parent | 7b22b0193002de14a4915f064acb4a7715c24059 (diff) | |
| download | rails-23fc5fe0e258414f8ac5fe53a297d312d6820462.tar.gz rails-23fc5fe0e258414f8ac5fe53a297d312d6820462.tar.bz2 rails-23fc5fe0e258414f8ac5fe53a297d312d6820462.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/time_with_zone.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index ec2c717942..63279d0e6d 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -12,7 +12,7 @@ module ActiveSupport # # Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)' # Time.zone.local(2007, 2, 10, 15, 30, 45) # => Sat, 10 Feb 2007 15:30:45 EST -05:00 - # Time.zone.parse('2007-02-01 15:30:45') # => Sat, 10 Feb 2007 15:30:45 EST -05:00 + # Time.zone.parse('2007-02-10 15:30:45') # => Sat, 10 Feb 2007 15:30:45 EST -05:00 # Time.zone.at(1170361845) # => Sat, 10 Feb 2007 15:30:45 EST -05:00 # Time.zone.now # => Sun, 18 May 2008 13:07:55 EDT -04:00 # Time.utc(2007, 2, 10, 20, 30, 45).in_time_zone # => Sat, 10 Feb 2007 15:30:45 EST -05:00 |