From aff64b94786b51d105a93ae3c635b5afca853554 Mon Sep 17 00:00:00 2001
From: ayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 4 Jun 2013 14:47:33 +0000
Subject: [PATCH] =?UTF-8?q?*=20object.c=20(rb=5FHash):=20fix=20docs.=20pat?=
 =?UTF-8?q?ched=20by=20Stefan=20Sch=C3=BC=C3=9Fler.=20=20=20[ruby-core:552?=
 =?UTF-8?q?99]=20[Bug=20#8487]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 object.c  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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
  */