Merged revisions 80718 via svnmerge from

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

................
  r80718 | jesus.cea | 2010-05-03 18:14:58 +0200 (Mon, 03 May 2010) | 9 lines

  Merged revisions 80716 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80716 | jesus.cea | 2010-05-03 18:09:21 +0200 (Mon, 03 May 2010) | 1 line

    wbits negative was documented SEVEN years ago
  ........
................

diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst
index 4bd8019833781dd21062fa895510538e85bf8ac2..f7ab0756d035fc00210f328310b86d2df19dcdb0 100644 (file)
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -104,9 +104,7 @@ The available exception and functions in this module are:
    value should be between 8 and 15 for the most recent versions of the zlib
    library, larger values resulting in better compression at the expense of greater
    memory usage.  The default value is 15.  When *wbits* is negative, the standard
-   :program:`gzip` header is suppressed; this is an undocumented feature of the
-   zlib library, used for compatibility with :program:`unzip`'s compression file
-   format.
+   :program:`gzip` header is suppressed.
 
    *bufsize* is the initial size of the buffer used to hold decompressed data.  If
    more space is required, the buffer size will be increased as needed, so you