yugui	2010-01-30 21:47:40 +0900 (Sat, 30 Jan 2010)

  New Revision: 26485

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26485

  Log:
    merges r25334 from trunk into ruby_1_9_1.
    --
    * string.c (rb_check_string_type): rdoc fix [ruby-core:26084]

  Modified files:
    branches/ruby_1_9_1/string.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/string.c
===================================================================
--- ruby_1_9_1/string.c	(revision 26484)
+++ ruby_1_9_1/string.c	(revision 26485)
@@ -1283,7 +1283,7 @@
  *     String.try_convert(obj) -> string or nil
  *
  *  Try to convert <i>obj</i> into a String, using to_str method.
- *  Returns converted regexp or nil if <i>obj</i> cannot be converted
+ *  Returns converted string or nil if <i>obj</i> cannot be converted
  *  for any reason.
  *
  *     String.try_convert("str")     # => str
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26484)
+++ ruby_1_9_1/version.h	(revision 26485)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 390
+#define RUBY_PATCHLEVEL 391
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/