summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/csv.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 98f5812045..d19adb1fc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 19 14:23:59 2015 Jake Worth <jakeworth82@gmail.com>
+
+ * lib/csv.rb (CSV#initialize): [DOC] Fix double-word typo.
+ [Fix GH-1161]
+
Sat Dec 19 10:33:33 2015 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/iso_8859_2.c, enc/windows_1250.c: separate Windows-1250
diff --git a/lib/csv.rb b/lib/csv.rb
index 6456da8103..ba9d62c706 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -1364,7 +1364,7 @@ class CSV
# a String for +data+, you can later retrieve it (after writing to it, for
# example) with CSV.string().
#
- # Note that a wrapped String will be positioned at at the beginning (for
+ # Note that a wrapped String will be positioned at the beginning (for
# reading). If you want it at the end (for writing), use CSV::generate().
# If you want any other positioning, pass a preset StringIO object instead.
#