merge with 3.3

2bb0ac0a · Georg Brandl · 8f9571e7 · 9ff06dcf · 2bb0ac0a
Commit 2bb0ac0a authored Oct 17, 2013 by Georg Brandl
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

Doc/library/zlib.rst Doc/library/zlib.rst +1 -2

No files found.
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -88,8 +88,7 @@ The available exception and functions in this module are:
   that are expected to be most common should come at the end of the dictionary.

   .. versionchanged:: 3.3
-      Added the *method*, *wbits*, *memlevel*, *strategy* and *zdict*
-      parameters.
+      Added the *zdict* parameter and keyword argument support.


 .. function:: crc32(data[, value])