summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-04 14:47:33 +0000
committerayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-04 14:47:33 +0000
commitaff64b94786b51d105a93ae3c635b5afca853554 (patch)
tree641d9bb74093a097c4c9492675b424cde95a8d4c
parent5f55e23f9c2feb774aaffde8c9e20213c7b97497 (diff)
* object.c (rb_Hash): fix docs. patched by Stefan Schüßler.
[ruby-core:55299] [Bug #8487] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--object.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e88b892f55..8df04e77cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 4 23:44:02 2013 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+
+ * object.c (rb_Hash): fix docs. patched by Stefan Schüßler.
+ [ruby-core:55299] [Bug #8487]
+
Tue Jun 4 23:16:49 2013 Benoit Daloze <eregontp@gmail.com>
* lib/irb/completion.rb: Use %w literal construction for long lists.
diff --git a/object.c b/object.c
index 0da87b079b..c1a52bdbf8 100644
--- a/object.c
+++ b/object.c
@@ -2897,7 +2897,7 @@ rb_Hash(VALUE val)
* <i>arg</i> is <tt>nil</tt> or <tt>[]</tt>.
*
* Hash([]) #=> {}
- * Hash(nil) #=> nil
+ * Hash(nil) #=> {}
* Hash(key: :value) #=> {:key => :value}
* Hash([1, 2, 3]) #=> TypeError
*/