changeset:   99198:d64bb25cf797
branch:      3.5
parent:      99193:1579de0b72f6
parent:      99197:660bdfaada64
user:        Martin Panter <vadmium+py@gmail.com>
date:        Wed Nov 18 02:45:51 2015 +0000
description:
Issue #23200: Merge zlib doc from 3.4 into 3.5


diff -r 1579de0b72f6 -r d64bb25cf797 Doc/library/zlib.rst
--- a/Doc/library/zlib.rst	Tue Nov 17 22:23:21 2015 +0000
+++ b/Doc/library/zlib.rst	Wed Nov 18 02:45:51 2015 +0000
@@ -230,7 +230,7 @@
    :meth:`decompress` method.  Some of the input data may be preserved in internal
    buffers for later processing.
 
-   If the optional parameter *max_length* is supplied then the return value will be
+   If the optional parameter *max_length* is non-zero then the return value will be
    no longer than *max_length*. This may mean that not all of the compressed input
    can be processed; and unconsumed data will be stored in the attribute
    :attr:`unconsumed_tail`. This bytestring must be passed to a subsequent call to