From 365958f285fb8d6b405895ab429a5515b7275989 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 22 May 2007 20:19:40 +0000 Subject: merge -c 12272 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 +++++- ext/iconv/iconv.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bf55e6392..cdfbbf8303 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -Thu May 10 10:14:14 2007 Nobuyoshi Nakada +Wed May 23 05:17:33 2007 NAKAMURA Usaku + + * ext/iconv/iconv.c (iconv_s_conv): rdoc fix. + +Wed May 23 05:10:02 2007 Nobuyoshi Nakada * eval.c (rb_thread_priority): rdoc fix; the initial value is inherited from the creating thread. [ruby-core:10607] diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 1c9d607de9..65fed33bd2 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -649,7 +649,7 @@ iconv_s_iconv /* * Document-method: Iconv::conv - * call-seq: Iconv.iconv(to, from, *strs) + * call-seq: Iconv.conv(to, from, str) * * Shorthand for * Iconv.iconv(to, from, str).join diff --git a/version.h b/version.h index a99512cf18..333ad80c6d 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-05-23" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070523 -#define RUBY_PATCHLEVEL 20 +#define RUBY_PATCHLEVEL 21 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3