summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-27 03:48:42 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-27 03:48:42 +0000
commit15bfc6ffbfe59ce71ad24d9327b34562b1470bd6 (patch)
tree78cc962a04562a7e6a4c1389ab93d7a14d7da01e
parent35748bdc85e7492984f084a8e112ab38a4edf121 (diff)
* time.c (time_s_mkutc): [DOC] Time.utc's 10 arguments form
doesn't examine wday, yday, isdst and tz. (time_s_mktime): [DOC] Time.mktime's 10 arguments form doesn't examine wday, yday and tz. Suggested by naruse. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--time.c8
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ad5b6b3432..5235853267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov 27 12:46:38 2014 Tanaka Akira <akr@fsij.org>
+
+ * time.c (time_s_mkutc): [DOC] Time.utc's 10 arguments form
+ doesn't examine wday, yday, isdst and tz.
+ (time_s_mktime): [DOC] Time.mktime's 10 arguments form
+ doesn't examine wday, yday and tz.
+ Suggested by naruse.
+
Thu Nov 27 11:45:33 2014 Eric Wong <e@80x24.org>
* iseq.c (iseq_data_to_ary): add missing GC guard
diff --git a/time.c b/time.c
index 5561f65bfe..05c7da4efe 100644
--- a/time.c
+++ b/time.c
@@ -3085,7 +3085,7 @@ time_utc_or_local(int argc, VALUE *argv, int utc_p, VALUE klass)
* Time.utc(year, month, day, hour, min) -> time
* Time.utc(year, month, day, hour, min, sec_with_frac) -> time
* Time.utc(year, month, day, hour, min, sec, usec_with_frac) -> time
- * Time.utc(sec, min, hour, day, month, year, wday, yday, isdst, tz) -> time
+ * Time.utc(sec, min, hour, day, month, year, dummy, dummy, dummy, dummy) -> time
* Time.gm(year) -> time
* Time.gm(year, month) -> time
* Time.gm(year, month, day) -> time
@@ -3093,7 +3093,7 @@ time_utc_or_local(int argc, VALUE *argv, int utc_p, VALUE klass)
* Time.gm(year, month, day, hour, min) -> time
* Time.gm(year, month, day, hour, min, sec_with_frac) -> time
* Time.gm(year, month, day, hour, min, sec, usec_with_frac) -> time
- * Time.gm(sec, min, hour, day, month, year, wday, yday, isdst, tz) -> time
+ * Time.gm(sec, min, hour, day, month, year, dummy, dummy, dummy, dummy) -> time
*
* Creates a Time object based on given values, interpreted as UTC (GMT). The
* year must be specified. Other values default to the minimum value
@@ -3123,7 +3123,7 @@ time_s_mkutc(int argc, VALUE *argv, VALUE klass)
* Time.local(year, month, day, hour, min) -> time
* Time.local(year, month, day, hour, min, sec_with_frac) -> time
* Time.local(year, month, day, hour, min, sec, usec_with_frac) -> time
- * Time.local(sec, min, hour, day, month, year, wday, yday, isdst, tz) -> time
+ * Time.local(sec, min, hour, day, month, year, dummy, dummy, isdst, dummy) -> time
* Time.mktime(year) -> time
* Time.mktime(year, month) -> time
* Time.mktime(year, month, day) -> time
@@ -3131,7 +3131,7 @@ time_s_mkutc(int argc, VALUE *argv, VALUE klass)
* Time.mktime(year, month, day, hour, min) -> time
* Time.mktime(year, month, day, hour, min, sec_with_frac) -> time
* Time.mktime(year, month, day, hour, min, sec, usec_with_frac) -> time
- * Time.mktime(sec, min, hour, day, month, year, wday, yday, isdst, tz) -> time
+ * Time.mktime(sec, min, hour, day, month, year, dummy, dummy, isdst, dummy) -> time
*
* Same as Time::gm, but interprets the values in the
* local time zone.