ruby-changes:47282
From: nagachika <ko1@a...>
Date: Sun, 23 Jul 2017 16:21:12 +0900 (JST)
Subject: [ruby-changes:47282] nagachika:r59397 (ruby_2_4): merge revision(s) 58643: [Backport #13231]
nagachika 2017-07-23 16:21:04 +0900 (Sun, 23 Jul 2017) New Revision: 59397 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59397 Log: merge revision(s) 58643: [Backport #13231] date_core.c: fix docs for %Z format * ext/date/date_core.c: [DOC] fix documentation for %Z format of {Date,DateTime}.strftime. Reported by Damon Timm. Based on a patch by nano. [ruby-core:79602] [Bug #13231] [Fix GH-1565] Modified directories: branches/ruby_2_4/ Modified files: branches/ruby_2_4/ext/date/date_core.c branches/ruby_2_4/version.h Index: ruby_2_4/ext/date/date_core.c =================================================================== --- ruby_2_4/ext/date/date_core.c (revision 59396) +++ ruby_2_4/ext/date/date_core.c (revision 59397) @@ -6802,7 +6802,7 @@ date_strftime_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ruby_2_4/ext/date/date_core.c#L6802 * %::z - hour, minute and second offset from UTC (e.g. +09:00:00) * %:::z - hour, minute and second offset from UTC * (e.g. +09, +09:30, +09:30:30) - * %Z - Time zone abbreviation name or something similar information. + * %Z - Equivalent to %:z (e.g. +09:00) * * Weekday: * %A - The full weekday name (``Sunday'') @@ -8247,7 +8247,7 @@ dt_lite_to_s(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/ext/date/date_core.c#L8247 * %::z - hour, minute and second offset from UTC (e.g. +09:00:00) * %:::z - hour, minute and second offset from UTC * (e.g. +09, +09:30, +09:30:30) - * %Z - Time zone abbreviation name or something similar information. + * %Z - Equivalent to %:z (e.g. +09:00) * * Weekday: * %A - The full weekday name (``Sunday'') Index: ruby_2_4/version.h =================================================================== --- ruby_2_4/version.h (revision 59396) +++ ruby_2_4/version.h (revision 59397) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1 #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-07-23" -#define RUBY_PATCHLEVEL 148 +#define RUBY_PATCHLEVEL 149 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 7 Index: ruby_2_4 =================================================================== --- ruby_2_4 (revision 59396) +++ ruby_2_4 (revision 59397) Property changes on: ruby_2_4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r58643 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/