summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-12 14:02:29 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-12 14:02:29 +0000
commitb2b4a4e79b97e3597665d9f8926fbcb460dc2939 (patch)
tree7bc0047c4fba282bf2ee683c923afec32fd8b928
parent7d847f22eb1b9d19aaab9b2d0239041335978f07 (diff)
downloadruby-b2b4a4e79b97e3597665d9f8926fbcb460dc2939.tar.gz
ruby-b2b4a4e79b97e3597665d9f8926fbcb460dc2939.tar.xz
ruby-b2b4a4e79b97e3597665d9f8926fbcb460dc2939.zip
merges r22744 from trunk into ruby_1_9_1.
-- * lib/csv.rb: Some minor documentation fixes from Gregory Brown. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/csv.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d0e0d2fb..8d24c37f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 4 05:19:27 2009 James Edward Gray II <jeg2@ruby-lang.org>
+
+ * lib/csv.rb: Some minor documentation fixes from Gregory Brown.
+
Wed Mar 4 00:54:43 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* lib/prime.rb (Prime::prime?): used to return a wrong answer.
diff --git a/lib/csv.rb b/lib/csv.rb
index 774f9c3ef..8adc2973b 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -2238,10 +2238,10 @@ class CSV
end
#
- # This method is an encoding safe version of Regexp::escape(). I will escape
+ # This method is an encoding safe version of Regexp::escape(). It will escape
# any characters that would change the meaning of a regular expression in the
# encoding of +str+. Regular expression characters that cannot be transcoded
- # to the target encodign will be skipped and no escaping will be performed if
+ # to the target encoding will be skipped and no escaping will be performed if
# a backslash cannot be transcoded.
#
def escape_re(str)