yugui	2010-11-24 18:38:02 +0900 (Wed, 24 Nov 2010)

  New Revision: 29921

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

  Log:
    merges r29332 from trunk into ruby_1_9_2.
    --
    * string.c (rb_str_to_i): fix rdoc: String#to_i raises an
      exception when base is invalid. [ruby-core:31685]
    
    Fri Sep 24 15:28:35 2010  NARUSE, Yui  <naruse@r...>

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/string.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29920)
+++ ruby_1_9_2/ChangeLog	(revision 29921)
@@ -1,3 +1,8 @@
+Fri Sep 24 15:50:43 2010  NARUSE, Yui  <naruse@r...>
+
+	* string.c (rb_str_to_i): fix rdoc: String#to_i raises an
+	  exception when base is invalid. [ruby-core:31685]
+
 Wed Sep 22 16:59:40 2010  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* test/test_prime.rb (TestPrime#test_new): the warning expected have
Index: ruby_1_9_2/string.c
===================================================================
--- ruby_1_9_2/string.c	(revision 29920)
+++ ruby_1_9_2/string.c	(revision 29921)
@@ -4015,7 +4015,7 @@
  *  integer base <i>base</i> (between 2 and 36). Extraneous characters past the
  *  end of a valid number are ignored. If there is not a valid number at the
  *  start of <i>str</i>, <code>0</code> is returned. This method never raises an
- *  exception.
+ *  exception when <i>base</i> is valid.
  *
  *     "12345".to_i             #=> 12345
  *     "99 red balloons".to_i   #=> 99
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29920)
+++ ruby_1_9_2/version.h	(revision 29921)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 52
+#define RUBY_PATCHLEVEL 53
 #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/