diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-06 08:18:13 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-06 08:18:13 +0000 |
| commit | 252afcd9f1731af234d3f5e7545d41752229c4c4 (patch) | |
| tree | 17070db49a4864874e7035e4b998b985282b7788 | |
| parent | 08e0c31d142616bc8bd81e861736928549f174a3 (diff) | |
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/time.rb | 14 |
2 files changed, 13 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Tue May 6 17:16:11 2014 Tanaka Akira <akr@fsij.org> + + * 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] + Tue May 6 04:31:48 2014 Tadayoshi Funaba <tadf@dotrb.org> * file.c (rb_f_test): removed meaningless "case 'a'". diff --git a/lib/time.rb b/lib/time.rb index a10c20bedc..19c0477ac1 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -296,13 +296,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 JST: - # 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 EST5EDT (Eastern Standard Time in US): + # 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 # # Since there are numerous conflicts among locally defined time zone # abbreviations all over the world, this method is not intended to |