diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-16 06:36:35 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-16 06:36:35 +0000 |
| commit | 768cfdd50bf53bbb10498906a7aa49a91ca008db (patch) | |
| tree | bebdd0a1279b82ac8bf4542dc005549b4b387133 /ext | |
| parent | ca90e7d844729e9abb9b31efcc8f2eec0d866a28 (diff) | |
merge revision(s) 36620: [Backport #8791]
* ext/date/date_{core,strftime}.c: [ruby-core:46990].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/date/date_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/date/date_core.c b/ext/date/date_core.c index 307cc47c59..3b15ccde29 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -7030,7 +7030,7 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self, * * Seconds since the Unix Epoch: * %s - Number of seconds since 1970-01-01 00:00:00 UTC. - * %Q - Number of microseconds since 1970-01-01 00:00:00 UTC. + * %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC. * * Literal string: * %n - Newline character (\n) @@ -8465,7 +8465,7 @@ dt_lite_to_s(VALUE self) * * Seconds since the Unix Epoch: * %s - Number of seconds since 1970-01-01 00:00:00 UTC. - * %Q - Number of microseconds since 1970-01-01 00:00:00 UTC. + * %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC. * * Literal string: * %n - Newline character (\n) |