aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--time.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index df12b70440..4ad38768b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 15 09:56:41 2016 Ian Lunderskov <ian.lunderskov@gmail.com>
+
+ * time.c: Minor typo in Time#dst? documentation.
+ [ci skip][fix GH-1290]
+
Tue Mar 15 04:36:41 2016 Charles Oliver Nutter <headius@headius.com>
* test/ruby/test_rubyoptions.rb (test_disable): add tests for
diff --git a/time.c b/time.c
index 603fe8bf63..d3f0ca2171 100644
--- a/time.c
+++ b/time.c
@@ -4959,7 +4959,7 @@ time_load(VALUE klass, VALUE str)
*
* t.year #=> 1993
*
- * Was is daylight savings at the time?
+ * Was it daylight savings at the time?
*
* t.dst? #=> false
*