merges r24088 from trunk into ruby_1_9_1.

--
* lib/tempfile (Tempfile.open): rdoc. patch by Nobuhiro IMAI.
  #1694

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 3319d4f88..d4d2112d3 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -190,7 +190,7 @@ class Tempfile < DelegateClass(File)
     #
     # If a block is given, it will be passed tempfile as an argument,
     # and the tempfile will automatically be closed when the block
-    # terminates.  In this case, open() returns nil.
+    # terminates.  The call returns the value of the block.
     def open(*args)
       tempfile = new(*args)
 
diff --git a/version.h b/version.h
index 8220c4bad..8c5f341ac 100644
--- a/version.h
+++ b/version.h
@@ -4,7 +4,7 @@
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
-#define RUBY_PATCHLEVEL 232
+#define RUBY_PATCHLEVEL 233
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
 #define RUBY_RELEASE_DAY 12