From 03ab27a83e1403bf0161965446f7548cd107ff1b Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 25 Mar 2017 18:55:01 +0000 Subject: 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_2@58128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/date/date_core.c | 24 ++++++++++++------------ version.h | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ext/date/date_core.c b/ext/date/date_core.c index 7361c27a52..a12a7761d3 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -6754,9 +6754,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. * * % @@ -8185,9 +8185,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. * * % @@ -8388,8 +8388,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 the number of digits for 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" @@ -8412,8 +8412,8 @@ dt_lite_iso8601(int argc, VALUE *argv, VALUE self) * call-seq: * dt.rfc3339([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').rfc3339(9) * #=> "2001-02-03T04:05:06.123456789+07:00" @@ -8428,8 +8428,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 080da031f9..8d9840381e 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.7" #define RUBY_RELEASE_DATE "2017-03-26" -#define RUBY_PATCHLEVEL 460 +#define RUBY_PATCHLEVEL 461 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3