merge revision(s) 24621:

	* lib/test/unit.rb (Test::Unit.run=, Test::Unit.run?): fixed rdoc.
	  [ruby-core:25034]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index fffb9c9b72..31bd82fdee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 14 13:28:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit.run=, Test::Unit.run?): fixed rdoc.
+	  [ruby-core:25034]
+
 Mon Dec 14 13:21:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/open3.rb (Open3#popen3): fixed and improved rdoc.  [ruby-core:25658]
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index ca68424b30..fdf786be18 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -261,12 +261,13 @@ module Test # :nodoc:
   #
 
   module Unit
-    # If set to false Test::Unit will not automatically run at exit.
+    # Set true when Test::Unit has run.  If set to true Test::Unit
+    # will not automatically run at exit.
     def self.run=(flag)
       @run = flag
     end
 
-    # Automatically run tests at exit?
+    # Already tests have run?
     def self.run?
       @run ||= false
     end
diff --git a/version.h b/version.h
index 377743d47f..792f1e611f 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-12-14"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091214
-#define RUBY_PATCHLEVEL 239
+#define RUBY_PATCHLEVEL 240
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8