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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 21 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ac9f5f8c1..dea5453721 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jan 31 20:09:50 2018  Marcus Stollsteimer  <sto.mar@web.de>
+
+	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@web.de>
 
 	lib/ostruct.rb: [DOC] revise docs for OpenStruct
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index eb1d385a7b..154c559976 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -6720,9 +6720,9 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *  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)
  *  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)
  *    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, VALUE self)
  * 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"
diff --git a/version.h b/version.h
index 8e9e74cdc9..4f3e4a43ab 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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