merges r21532 from trunk into ruby_1_9_1.

Add rdoc.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 1 deletions

diff --git a/transcode.c b/transcode.c
index b2d6706f7..b01d4a1f0 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