usa	2017-06-30 21:52:42 +0900 (Fri, 30 Jun 2017)

  New Revision: 59237

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

  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_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/ext/date/date_core.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/ext/date/date_core.c
===================================================================
--- ruby_2_3/ext/date/date_core.c	(revision 59236)
+++ ruby_2_3/ext/date/date_core.c	(revision 59237)
@@ -6787,7 +6787,7 @@ date_strftime_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/date/date_core.c#L6787
  *              %::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) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/date/date_core.c#L8218
  *              %::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_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 59236)
+++ ruby_2_3/ChangeLog	(revision 59237)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Fri Jun 30 21:51:40 2017  Marcus Stollsteimer  <sto.mar@w...>
+
+	* 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@c...>
 
 	* lib/rss/rss.rb: Accept empty text element as valid element
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 59236)
+++ ruby_2_3/version.h	(revision 59237)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #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
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 59236)
+++ ruby_2_3	(revision 59237)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r58643

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