summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-24 09:38:02 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-24 09:38:02 +0000
commit0d5b4489061dcb88b8c6bf6fea59e7fe63df68ca (patch)
tree58ac8600bf8583715d16a34439d21faa42fc5af0 /string.c
parentcfeb4beeffa9ce81cdc5e338da1f15731d752725 (diff)
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@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/string.c b/string.c
index c85d249760..c38983561b 100644
--- a/string.c
+++ b/string.c
@@ -4015,7 +4015,7 @@ rb_str_include(VALUE str, VALUE arg)
* 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