diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:06:17 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:06:17 +0000 |
commit | 93d4433c14d87a32e5fec5fab678a6b1a94beaab (patch) | |
tree | 089100f6f5ff12908b144a5b9ce60554758b9d4a | |
parent | e3e9779119f4548f23dbdd624668dfa83ae839ef (diff) |
merges r29422 from trunk into ruby_1_9_2.
--
* lib/csv.rb: Fixing documentation typos. [ruby-core:32712]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/csv.rb | 8 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Fri Oct 8 00:24:54 2010 James Edward Gray II <jeg2@ruby-lang.org> + + * lib/csv.rb: Fixing documentation typos. [ruby-core:32712] + Thu Oct 7 18:10:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on diff --git a/lib/csv.rb b/lib/csv.rb index 8685e3d658..86209eb19b 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -1189,7 +1189,7 @@ class CSV # also understands an additional <tt>:encoding</tt> parameter that you can use # to specify the Encoding of the data in the file to be read. You must provide # this unless your data is in Encoding::default_external(). CSV will use this - # to deterime how to parse the data. You may provide a second Encoding to + # to determine how to parse the data. You may provide a second Encoding to # have the data transcoded as it is read. For example, # <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file # but transcode it to UTF-8 before CSV parses it. @@ -1285,7 +1285,7 @@ class CSV # # You must provide a +mode+ with an embedded Encoding designator unless your # data is in Encoding::default_external(). CSV will check the Encoding of the - # underlying IO object (set by the +mode+ you pass) to deterime how to parse + # underlying IO object (set by the +mode+ you pass) to determine how to parse # the data. You may provide a second Encoding to have the data transcoded as # it is read just as you can with a normal call to IO::open(). For example, # <tt>"rb:UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file but @@ -1387,7 +1387,7 @@ class CSV # file and any +options+ CSV::new() understands. This method also understands # an additional <tt>:encoding</tt> parameter that you can use to specify the # Encoding of the data in the file to be read. You must provide this unless - # your data is in Encoding::default_external(). CSV will use this to deterime + # your data is in Encoding::default_external(). CSV will use this to determine # how to parse the data. You may provide a second Encoding to have the data # transcoded as it is read. For example, # <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file @@ -1931,7 +1931,7 @@ class CSV alias_method :readline, :shift # - # Returns a simplified description of the key FasterCSV attributes in an + # Returns a simplified description of the key CSV attributes in an # ASCII compatible String. # def inspect @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 63 +#define RUBY_PATCHLEVEL 64 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |