aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--time.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e59761e29..8e7b80c001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 22 20:34:04 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * time.c (time_asctime): [DOC] add ctime example, not only
+ asctime. [ruby-core:75126] [Bug #12310]
+
Fri Apr 22 18:44:32 2016 NARUSE, Yui <naruse@ruby-lang.org>
* variable.c: use uint32_t instead of long to avoid confusion about
diff --git a/time.c b/time.c
index 111b71e203..336d7c26a8 100644
--- a/time.c
+++ b/time.c
@@ -3547,6 +3547,7 @@ static VALUE strftime_cstr(const char *fmt, size_t len, VALUE time, rb_encoding
* Returns a canonical string representation of _time_.
*
* Time.now.asctime #=> "Wed Apr 9 08:56:03 2003"
+ * Time.now.ctime #=> "Wed Apr 9 08:56:03 2003"
*/
static VALUE