aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-04 03:33:50 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-04 03:33:50 +0000
commit5363dce93848410097471355cd578d1e68fa2c93 (patch)
treecbe9796761f35d95d124185e0e83003b52b0539f
parentab337e61ecb5f42384ba7d710c36faf96a454e5c (diff)
downloadruby-5363dce93848410097471355cd578d1e68fa2c93.tar.gz
* object.c: fix document of Kernel.Stirng by @suzukaze
[fix GH-743][ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--object.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e5c702d967..c8736b456c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 4 12:33:44 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * object.c: fix document of Kernel.Stirng by @suzukaze
+ [fix GH-743][ci skip]
+
Tue Nov 4 12:21:45 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/csv.rb: added documentation for skip_blanks option by @decasia
diff --git a/object.c b/object.c
index f330aeeab5..5834c81e74 100644
--- a/object.c
+++ b/object.c
@@ -3018,8 +3018,9 @@ rb_String(VALUE val)
* call-seq:
* String(arg) -> string
*
- * Converts <i>arg</i> to a <code>String</code> by calling its
- * <code>to_s</code> method.
+ * Returns <i>arg</i> as an <code>String</code>.
+ *
+ * First tries to call its <code>to_str</code> method, then its <code>to_s</code> method.
*
* String(self) #=> "main"
* String(self.class) #=> "Object"