summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/optparse.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d5b3231bc1..fe9b6e6c74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 8 10:19:02 2015 Jake Worth <jakeworth82@gmail.com>
+
+ * lib/optparse.rb: fix double word typo in the document.
+ [Misc #10608] [Fix GH-1126]
+
Tue Dec 8 09:03:19 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/date/date_core.c (d_lite_lshift): should check the argument
diff --git a/lib/optparse.rb b/lib/optparse.rb
index e2cd964351..2e8b5971a2 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -172,7 +172,7 @@
# ==== Using Built-in Conversions
#
# As an example, the built-in +Time+ conversion is used. The other built-in
-# conversions behave in in the same way.
+# conversions behave in the same way.
# OptionParser will attempt to parse the argument
# as a +Time+. If it succeeeds, that time will be passed to the
# handler block. Otherwise, an exception will be raised.