diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-20 16:41:49 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-20 16:41:49 +0000 |
| commit | 447e1c4d199181bc02935e00589c3cc2668a5e1e (patch) | |
| tree | 049fa0e0974aeae4257e01ac8c2d2592e6b7937f /lib/time.rb | |
| parent | c3fd3191fc9801b43daa0125d1df1ced383011b8 (diff) | |
merge revision(s) r45349,r45837,r45838: [Backport #9521] [Backport #9682]
* lib/time.rb: [DOC] Fix timezone in example of Time.parse [Bug #9521]
Based on patch by @stomar
* lib/time.rb (Time.parse): [DOC] Fix an example in the documentation.
Reported by Marcus Stollsteimer.
[ruby-core:60778] [Bug #9521] and [ruby-core:61718] [Bug #9682]
* lib/time.rb (Time.parse): [DOC] Fix an example in the documentation
to use EST.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/time.rb')
| -rw-r--r-- | lib/time.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/time.rb b/lib/time.rb index 0b55480334..dd7a513dba 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -278,13 +278,13 @@ class Time # supplied with those of +now+. For the lower components, the minimum # values (1 or 0) are assumed if broken or missing. For example: # - # # Suppose it is "Thu Nov 29 14:33:20 GMT 2001" now and - # # your time zone is GMT: - # now = Time.parse("Thu Nov 29 14:33:20 GMT 2001") - # Time.parse("16:30", now) #=> 2001-11-29 16:30:00 +0900 - # Time.parse("7/23", now) #=> 2001-07-23 00:00:00 +0900 - # Time.parse("Aug 31", now) #=> 2001-08-31 00:00:00 +0900 - # Time.parse("Aug 2000", now) #=> 2000-08-01 00:00:00 +0900 + # # Suppose it is "Thu Nov 29 14:33:20 2001" now and + # # 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 -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 |