diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-06 08:27:47 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-06 08:27:47 +0000 |
| commit | 1c3f862f589ceea1bcc24fb4fe177997a274d71c (patch) | |
| tree | 0f9472b986bc9034d975d7c85d68ca6420f32100 | |
| parent | 252afcd9f1731af234d3f5e7545d41752229c4c4 (diff) | |
[DOC] Use EST for previous documentation fix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/time.rb | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -1,6 +1,7 @@ -Tue May 6 17:16:11 2014 Tanaka Akira <akr@fsij.org> +Tue May 6 17:27:06 2014 Tanaka Akira <akr@fsij.org> - * lib/time.rb (Time.parse): [DOC] Fix an example in the documentation. + * lib/time.rb (Time.parse): [DOC] Fix an example in the documentation + to use EST. Reported by Marcus Stollsteimer. [ruby-core:60778] [Bug #9521] and [ruby-core:61718] [Bug #9682] diff --git a/lib/time.rb b/lib/time.rb index 19c0477ac1..edb1452d52 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -297,12 +297,12 @@ class Time # values (1 or 0) are assumed if broken or missing. For example: # # # Suppose it is "Thu Nov 29 14:33:20 2001" now and - # # your time zone is EST5EDT (Eastern Standard Time in US): + # # your time zone is EST which is GMT-5. # now = Time.parse("Thu Nov 29 14:33:20 2001") # Time.parse("16:30", now) #=> 2001-11-29 16:30:00 -0500 - # Time.parse("7/23", now) #=> 2001-07-23 00:00:00 -0400 - # Time.parse("Aug 31", now) #=> 2001-08-31 00:00:00 -0400 - # Time.parse("Aug 2000", now) #=> 2000-08-01 00:00:00 -0400 + # Time.parse("7/23", now) #=> 2001-07-23 00:00:00 -0500 + # Time.parse("Aug 31", now) #=> 2001-08-31 00:00:00 -0500 + # Time.parse("Aug 2000", now) #=> 2000-08-01 00:00:00 -0500 # # Since there are numerous conflicts among locally defined time zone # abbreviations all over the world, this method is not intended to |