yugui	2010-12-02 17:06:17 +0900 (Thu, 02 Dec 2010)

  New Revision: 30033

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30033

  Log:
    merges r29422 from trunk into ruby_1_9_2.
    --
    * lib/csv.rb: Fixing documentation typos.  [ruby-core:32712]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/csv.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30032)
+++ ruby_1_9_2/ChangeLog	(revision 30033)
@@ -1,3 +1,7 @@
+Fri Oct  8 00:24:54 2010  James Edward Gray II  <jeg2@r...>
+
+	* lib/csv.rb: Fixing documentation typos.  [ruby-core:32712]
+
 Thu Oct  7 18:10:35 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on
Index: ruby_1_9_2/lib/csv.rb
===================================================================
--- ruby_1_9_2/lib/csv.rb	(revision 30032)
+++ ruby_1_9_2/lib/csv.rb	(revision 30033)
@@ -1189,7 +1189,7 @@
   # 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 @@
   #
   # 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 @@
   # 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 @@
   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
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30032)
+++ ruby_1_9_2/version.h	(revision 30033)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/