akr	2014-05-06 17:18:13 +0900 (Tue, 06 May 2014)

  New Revision: 45837

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45837

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/lib/time.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 45836)
+++ ChangeLog	(revision 45837)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue May  6 17:16:11 2014  Tanaka Akira  <akr@f...>
+
+	* 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@d...>
 
 	* file.c (rb_f_test): removed meaningless "case 'a'".
Index: lib/time.rb
===================================================================
--- lib/time.rb	(revision 45836)
+++ lib/time.rb	(revision 45837)
@@ -296,13 +296,13 @@ class Time https://github.com/ruby/ruby/blob/trunk/lib/time.rb#L296
     # 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/