From 365958f285fb8d6b405895ab429a5515b7275989 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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
---
 ext/iconv/iconv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext/iconv')

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
-- 
cgit v1.2.3