From f563dc875cbcd697021602a9b648b0c50bdfcddd Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 10 May 2007 01:12:10 +0000
Subject: [PATCH] * thread.c (rb_thread_priority): rdoc fix; the initial value
 is   inherited from the creating thread.  [ruby-core:10607]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 +++++
 thread.c  | 10 ++++++----
 version.h |  6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e9cf0a535..1ddc778ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 10 10:13:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_priority): rdoc fix; the initial value is
+	  inherited from the creating thread.  [ruby-core:10607]
+
 Wed May  9 12:28:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (Init_Bignum), numeric.c (Init_Numeric): added fdiv as
diff --git a/thread.c b/thread.c
index 8e76b83b9f..230439b722 100644
--- a/thread.c
+++ b/thread.c
@@ -1508,10 +1508,12 @@ rb_thread_keys(VALUE self)
 /*
  *  call-seq:
  *     thr.priority   => integer
- *  
- *  Returns the priority of <i>thr</i>. Default is zero; higher-priority threads
- *  will run before lower-priority threads.
- *     
+ *
+ *  Returns the priority of <i>thr</i>. Default is inherited from the
+ *  current thread which creating the new thread, or zero for the
+ *  initial main thread; higher-priority threads will run before
+ *  lower-priority threads.
+ *
  *     Thread.current.priority   #=> 0
  */
 
diff --git a/version.h b/version.h
index d17c4a8ab1..4e15164337 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-05-09"
+#define RUBY_RELEASE_DATE "2007-05-10"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070509
+#define RUBY_RELEASE_CODE 20070510
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];