aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/scanf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bc76b9800f..3066d279e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 3 15:39:21 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * lib/scanf.rb: fixed double words typo.
+ [ci skip][fix GH-1123] Patch by @jwworth
+
Thu Dec 3 15:37:56 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* test/ruby/test_mixed_unicode_escapes.rb: fixed typo.
diff --git a/lib/scanf.rb b/lib/scanf.rb
index b6c5287664..d12dc12f55 100644
--- a/lib/scanf.rb
+++ b/lib/scanf.rb
@@ -610,7 +610,7 @@ class IO
#
# See Scanf for details on creating a format string.
#
- # You will need to require 'scanf' to use use IO#scanf.
+ # You will need to require 'scanf' to use IO#scanf.
def scanf(str,&b) #:yield: current_match
return block_scanf(str,&b) if b
return [] unless str.size > 0