kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) r45349,r45837,r45838: [Backport #9521] [Backport #9682]

Browse source 
* 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
This commit is contained in:
nagachika 2014-08-20 16:41:49 +00:00
parent c3fd3191fc
commit 447e1c4d19
3 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Thu Aug 21 01:41:09 2014 Tanaka Akira <akr@fsij.org>
* 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@zzak.io>
* 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@ruby-lang.org>
merge r46831 partially. extracted commits are as follows.

14
lib/time.rb
View file

@ -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

6
version.h
View file

@ -1,10 +1,10 @@
#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"