merges r24830 from trunk into ruby_1_9_1.

--
* lib/net/http.rb (fetch): rdoc fix, patch by Arthur Schreiber, [ruby-core:18309].

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

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9db193d9f..3298222ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 11 01:14:00 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/net/http.rb (fetch): rdoc fix, patch by Arthur Schreiber.
+	  [ruby-core:18309].
+
 Thu Sep 10 21:22:01 2009  Tanaka Akira  <akr@fsij.org>
 
 	* test/dl/test_cptr.rb (test_free=): test SEGV at first.
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 8e0c3b208..d2a97de8d 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1289,8 +1289,9 @@ module Net   #:nodoc:
     end
 
     # Returns the header field corresponding to the case-insensitive key.
-    # Returns the default value +args+, or the result of the block, or nil,
-    # if there's no header field named key.  See Hash#fetch
+    # Returns the default value +args+, or the result of the block, or
+    # raises an IndexErrror if there's no header field named +key+
+    # See Hash#fetch
     def fetch(key, *args, &block)   #:yield: +key+
       a = @header.fetch(key.downcase, *args, &block)
       a.join(', ')
diff --git a/version.h b/version.h
index 60aa873c1..4146a07bb 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 320
+#define RUBY_PATCHLEVEL 321
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1