archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 58643: [Backport #13231]

Browse source 
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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-07-23 07:21:04 +00:00
parent 5beaa53ad5
commit 731b534e63
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/date/date_core.c
View file

@ -6802,7 +6802,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
* %::z - hour, minute and second offset from UTC (e.g. +09:00:00) * %::z - hour, minute and second offset from UTC (e.g. +09:00:00)
* %:::z - hour, minute and second offset from UTC * %:::z - hour, minute and second offset from UTC
* (e.g. +09, +09:30, +09:30:30) * (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: * Weekday:
* %A - The full weekday name (``Sunday'') * %A - The full weekday name (``Sunday'')
@ -8247,7 +8247,7 @@ dt_lite_to_s(VALUE self)
* %::z - hour, minute and second offset from UTC (e.g. +09:00:00) * %::z - hour, minute and second offset from UTC (e.g. +09:00:00)
* %:::z - hour, minute and second offset from UTC * %:::z - hour, minute and second offset from UTC
* (e.g. +09, +09:30, +09:30:30) * (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: * Weekday:
* %A - The full weekday name (``Sunday'') * %A - The full weekday name (``Sunday'')

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.2" #define RUBY_VERSION "2.4.2"
#define RUBY_RELEASE_DATE "2017-07-23" #define RUBY_RELEASE_DATE "2017-07-23"
#define RUBY_PATCHLEVEL 148 #define RUBY_PATCHLEVEL 149
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7