summaryrefslogtreecommitdiff
path: root/transcode.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 15:40:21 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 15:40:21 +0000
commitb371ce9d6a4bcb4bc315054769257650f24075e4 (patch)
tree5a18be63df426084182bf15531f1cb43a502cfc2 /transcode.c
parent905114d69f2b416500662a7e40f9ce4958e797d0 (diff)
merges r21532 from trunk into ruby_1_9_1.
Add rdoc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/transcode.c b/transcode.c
index b2d6706f7e..b01d4a1f08 100644
--- a/transcode.c
+++ b/transcode.c
@@ -2889,7 +2889,7 @@ econv_s_search_convpath(int argc, VALUE *argv, VALUE klass)
}
/*
- * Check the existence of a convertsion path.
+ * Check the existence of a conversion path.
* Returns the number of converters in the conversion path.
* result: >=0:success -1:failure
*/
@@ -3496,6 +3496,10 @@ econv_primitive_convert(int argc, VALUE *argv, VALUE self)
* If a conversion error occur,
* Encoding::UndefinedConversionError or
* Encoding::InvalidByteSequenceError is raised.
+ * Encoding::Converter#convert doesn't supply methods to recover or restart
+ * from these exceptions.
+ * When you want to handle these conversion errors,
+ * use Encoding::Converter#primitive_convert.
*
*/
static VALUE