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

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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-06-30 12:52:42 +00:00
parent 30519c0b6a
commit c42f46bfc7
3 changed files with 10 additions and 3 deletions

View file

@ -1,3 +1,10 @@
Fri Jun 30 21:51:40 2017 Marcus Stollsteimer <sto.mar@web.de>
* 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.
[Bug #13231] [Fix GH-1565]
Fri Jun 30 21:46:50 2017 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb: Accept empty text element as valid element

View file

@ -6787,7 +6787,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, +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'')
@ -8218,7 +8218,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, +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'')

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.5"
#define RUBY_RELEASE_DATE "2017-06-30"
#define RUBY_PATCHLEVEL 333
#define RUBY_PATCHLEVEL 334
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 6