summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-21 09:15:16 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-21 09:15:16 +0000
commite4d2470612d0de50e7d8600e35c5ad7adfe34451 (patch)
tree82f59d3bcd396fb7f941c75bb4721336d097e206
parentb3260dbefc0f9347ecb78a4f1c481d246ca9a613 (diff)
merges r23682 from trunk into ruby_1_9_1.
-- Fix rdoc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--transcode.c10
-rw-r--r--version.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/transcode.c b/transcode.c
index b01d4a1f08..18ddd5fd4f 100644
--- a/transcode.c
+++ b/transcode.c
@@ -3346,17 +3346,17 @@ econv_result_to_symbol(rb_econv_result_t res)
*
* example:
* ec = Encoding::Converter.new("UTF-8", "UTF-16BE")
- * ret = ec.primitive_convert(src="pi", dst="", 100)
+ * ret = ec.primitive_convert(src="pi", dst="", nil, 100)
* p [ret, src, dst] #=> [:finished, "", "\x00p\x00i"]
*
* ec = Encoding::Converter.new("UTF-8", "UTF-16BE")
- * ret = ec.primitive_convert(src="pi", dst="", 1)
+ * ret = ec.primitive_convert(src="pi", dst="", nil, 1)
* p [ret, src, dst] #=> [:destination_buffer_full, "i", "\x00"]
- * ret = ec.primitive_convert(src, dst="", 1)
+ * ret = ec.primitive_convert(src, dst="", nil, 1)
* p [ret, src, dst] #=> [:destination_buffer_full, "", "p"]
- * ret = ec.primitive_convert(src, dst="", 1)
+ * ret = ec.primitive_convert(src, dst="", nil, 1)
* p [ret, src, dst] #=> [:destination_buffer_full, "", "\x00"]
- * ret = ec.primitive_convert(src, dst="", 1)
+ * ret = ec.primitive_convert(src, dst="", nil, 1)
* p [ret, src, dst] #=> [:finished, "", "i"]
*
*/
diff --git a/version.h b/version.h
index 0b0f19fb9e..70bebf44c8 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 176
+#define RUBY_PATCHLEVEL 177
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1