aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-03-06 16:22:08 +0100
committerSverker Eriksson <[email protected]>2017-03-06 16:22:08 +0100
commit23e60014ee1de86cbf163716a61905db7af954ed (patch)
treebeba5bf5ade529d22616c1103c87d74679c47e70 /erts
parent6534f024ec21969fa054afd3f728b3e3d39f6142 (diff)
parent358d3f1b72a8b18909d18d0d85fe240856bdd8d5 (diff)
downloadotp-23e60014ee1de86cbf163716a61905db7af954ed.tar.gz
otp-23e60014ee1de86cbf163716a61905db7af954ed.tar.bz2
otp-23e60014ee1de86cbf163716a61905db7af954ed.zip
Merge branch 'sverker/zlib-option-8/ERL-362/OTP-14254' into maint
AGAIN * sverker/zlib-option-8/ERL-362/OTP-14254: erts: Fix typo and clearify warning in zlib docs
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/zlib.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/zlib.xml b/erts/doc/src/zlib.xml
index 583d21ad7b..7ae507b8f6 100644
--- a/erts/doc/src/zlib.xml
+++ b/erts/doc/src/zlib.xml
@@ -316,7 +316,7 @@ list_to_binary([B1,B2])</pre>
(and checksum) from the stream. Notice that the zlib source
mentions this only as a undocumented feature.</p>
<warning>
- <p>Due to a known bug in zlib, <c>WindowsBits</c> values 8 and -8
+ <p>Due to a known bug in the underlying zlib library, <c>WindowBits</c> values 8 and -8
do not work as expected. In zlib versions before 1.2.9 values
8 and -8 are automatically changed to 9 and -9. <em>From zlib version 1.2.9
value -8 is rejected</em> causing <c>zlib:deflateInit/6</c> to fail