From db0f86030891ee91fb2e2b116dcc05bb3bcc019e Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 9 Mar 2015 17:40:36 +0000
Subject: merge revision(s) r49428: [Backport #10694]

	* thread.c: Improve documentation for Thread#value
	  [Bug #10694][ruby-core:67324][ci skip]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 thread.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'thread.c')

diff --git a/thread.c b/thread.c
index b24d29e087..605ac60c08 100644
--- a/thread.c
+++ b/thread.c
@@ -916,10 +916,14 @@ thread_join_m(int argc, VALUE *argv, VALUE self)
  *  call-seq:
  *     thr.value   -> obj
  *
- *  Waits for +thr+ to complete, using #join, and returns its value.
+ *  Waits for +thr+ to complete, using #join, and returns its value or raises
+ *  the exception which terminated the thread.
  *
  *     a = Thread.new { 2 + 2 }
  *     a.value   #=> 4
+ *
+ *     b = Thread.new { raise 'something went wrong' }
+ *     b.value   #=> RuntimeError: something went wrong
  */
 
 static VALUE
-- 
cgit v1.2.3