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 44e9edb5dcb516c0d84e17751c22b542500ecf0c..c325df354af49b4906218d7f13c302791e0e7efd 100644 (file)
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -108,9 +108,7 @@ The available exception and functions in this module are:
    than the size originally used to compress the stream; using a too-small
    value will result in an exception. The default value is therefore the
    highest value, 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