archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merges r29422 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2010-12-02 08:06:17 +00:00
parent e3e9779119
commit 93d4433c14
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> Thu Oct 7 18:10:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on * cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on

8
lib/csv.rb
View file

@ -1189,7 +1189,7 @@ class CSV
# also understands an additional <tt>:encoding</tt> parameter that you can use # 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 # 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 # 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, # 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 # <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. # 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 # 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 # 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 # 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, # 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 # <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 # file and any +options+ CSV::new() understands. This method also understands
# an additional <tt>:encoding</tt> parameter that you can use to specify the # 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 # 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 # how to parse the data. You may provide a second Encoding to have the data
# transcoded as it is read. For example, # transcoded as it is read. For example,
# <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file # <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 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. # ASCII compatible String.
# #
def inspect def inspect

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 63 #define RUBY_PATCHLEVEL 64
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1