[Python-checkins] r80719 - in python/branches/release31-maint: Doc/library/zlib.rst

[jesus.cea]

Author: jesus.cea
Date: Mon May  3 18:17:30 2010
New Revision: 80719

Log:
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
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/zlib.rst

Modified: python/branches/release31-maint/Doc/library/zlib.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/zlib.rst	(original)
+++ python/branches/release31-maint/Doc/library/zlib.rst	Mon May  3 18:17:30 2010
@@ -104,9 +104,7 @@
    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