usa	2018-01-31 20:10:20 +0900 (Wed, 31 Jan 2018)

  New Revision: 62128

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

  Log:
    merge revision(s) 58020: [Backport #10936]
    
    date_core.c: fix error in DateTime docs
    
    * ext/date/date_core.c: [DOC] fix format string for DateTime#rfc3339.
      Reported by Andreas Rayo Kniep.  [ruby-core:68418] [Bug #10936]
    
    * ext/date/date_core.c: [DOC] ditto for DateTime#iso8601 and
      DateTime#xmlschema; other small improvements.

  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/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 62127)
+++ ruby_2_3/ChangeLog	(revision 62128)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Wed Jan 31 20:09:50 2018  Marcus Stollsteimer  <sto.mar@w...>
+
+	date_core.c: fix error in DateTime docs
+
+	* ext/date/date_core.c: [DOC] fix format string for DateTime#rfc3339.
+	  Reported by Andreas Rayo Kniep.  [ruby-core:68418] [Bug #10936]
+
+	* ext/date/date_core.c: [DOC] ditto for DateTime#iso8601 and
+	  DateTime#xmlschema; other small improvements.
+
 Wed Jan 31 20:04:47 2018  Marcus Stollsteimer  <sto.mar@w...>
 
 	lib/ostruct.rb: [DOC] revise docs for OpenStruct
Index: ruby_2_3/ext/date/date_core.c
===================================================================
--- ruby_2_3/ext/date/date_core.c	(revision 62127)
+++ ruby_2_3/ext/date/date_core.c	(revision 62128)
@@ -6720,9 +6720,9 @@ date_strftime_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/date/date_core.c#L6720
  *  Any text not listed as a directive will be passed through to the
  *  output string.
  *
- *  The directive consists of a percent (%) character,
- *  zero or more flags, optional minimum field width,
- *  optional modifier and a conversion specifier
+ *  A directive consists of a percent (%) character,
+ *  zero or more flags, an optional minimum field width,
+ *  an optional modifier, and a conversion specifier
  *  as follows.
  *
  *    %<flags><width><modifier><conversion>
@@ -8150,9 +8150,9 @@ dt_lite_to_s(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/date/date_core.c#L8150
  *  Any text not listed as a directive will be passed through to the
  *  output string.
  *
- *  The directive consists of a percent (%) character,
- *  zero or more flags, optional minimum field width,
- *  optional modifier and a conversion specifier
+ *  A directive consists of a percent (%) character,
+ *  zero or more flags, an optional minimum field width,
+ *  an optional modifier, and a conversion specifier
  *  as follows.
  *
  *    %<flags><width><modifier><conversion>
@@ -8352,8 +8352,8 @@ iso8601_timediv(VALUE self, VALUE n) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/date/date_core.c#L8352
  *    dt.iso8601([n=0])    ->  string
  *    dt.xmlschema([n=0])  ->  string
  *
- * This method is equivalent to strftime('%FT%T').  The optional
- * argument n is length of fractional seconds.
+ * This method is equivalent to strftime('%FT%T%:z').
+ * The optional argument +n+ is the number of digits for fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').iso8601(9)
  *				#=> "2001-02-03T04:05:06.123456789+07:00"
@@ -8392,8 +8392,8 @@ dt_lite_rfc3339(int argc, VALUE *argv, V https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/date/date_core.c#L8392
  * call-seq:
  *    dt.jisx0301([n=0])  ->  string
  *
- * Returns a string in a JIS X 0301 format.  The optional argument n
- * is length of fractional seconds.
+ * Returns a string in a JIS X 0301 format.
+ * The optional argument +n+ is the number of digits for fractional seconds.
  *
  *    DateTime.parse('2001-02-03T04:05:06.123456789+07:00').jisx0301(9)
  *				#=> "H13.02.03T04:05:06.123456789+07:00"
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 62127)
+++ ruby_2_3/version.h	(revision 62128)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.7"
 #define RUBY_RELEASE_DATE "2018-01-31"
-#define RUBY_PATCHLEVEL 389
+#define RUBY_PATCHLEVEL 390
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 62127)
+++ ruby_2_3	(revision 62128)

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

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