nagachika	2014-08-21 01:41:49 +0900 (Thu, 21 Aug 2014)

  New Revision: 47228

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

  Log:
    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.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/time.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47227)
+++ ruby_2_1/ChangeLog	(revision 47228)
@@ -1,3 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Aug 21 01:41:09 2014  Tanaka Akira  <akr@f...>
+
+	* 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]
+
+Thu Aug 21 01:41:09 2014  Zachary Scott  <e@z...>
+
+	* lib/time.rb: [DOC] Fix timezone in example of Time.parse [Bug #9521]
+	  Based on patch by @stomar
+
 Tue Aug 19 23:31:48 2014  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	merge r46831 partially. extracted commits are as follows.
Index: ruby_2_1/lib/time.rb
===================================================================
--- ruby_2_1/lib/time.rb	(revision 47227)
+++ ruby_2_1/lib/time.rb	(revision 47228)
@@ -278,13 +278,13 @@ class Time https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/time.rb#L278
     # 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
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47227)
+++ ruby_2_1/version.h	(revision 47228)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-08-20"
-#define RUBY_PATCHLEVEL 203
+#define RUBY_RELEASE_DATE "2014-08-21"
+#define RUBY_PATCHLEVEL 204
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45349,45837-45838


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