Merged revisions 83529 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83529 | senthil.kumaran | 2010-08-02 22:39:02 +0530 (Mon, 02 Aug 2010) | 3 lines

  Rewording the getheader method of HTTPResponse.
........

diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index 3a44788f8a0c7e8e7820123a127ff23c97db9768..fe6581285a213d0b5c990d7b74c59ea5824d0ce1 100644 (file)
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -448,9 +448,10 @@ statement.
 
 .. method:: HTTPResponse.getheader(name, default=None)
 
-   Get the contents of the header *name*, or *default* if there is no matching
-   header. If *default* is an iterator other than a string, then the return
-   value will be a string consisting of items of the iterator joined by comma.
+   Return the value of the header *name*, or *default* if there is no header
+   matching *name*.  If there is more than one  header with the name *name*,
+   return all of the values joined by ', '.  If 'default' is any iterable other
+   than a single string, its elements are similarly returned joined by commas.
 
 
 .. method:: HTTPResponse.getheaders()