aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-11-12 09:30:23 +0100
committerBruce Yinhe <[email protected]>2014-11-12 09:30:23 +0100
commit8f32884f7301064d2a45a50854892cdc966e3048 (patch)
treefab1705b81f6a73c923d7e65f0febcdb22c30a35
parent19f5722c9fb31ed88c45de1f17221941edaebd2f (diff)
parente38e7f9bd7756037c9c42a4d97278fead0402629 (diff)
downloadotp-8f32884f7301064d2a45a50854892cdc966e3048.tar.gz
otp-8f32884f7301064d2a45a50854892cdc966e3048.tar.bz2
otp-8f32884f7301064d2a45a50854892cdc966e3048.zip
Merge branch 'maint'
-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 11a7437f5a..da8ccdecdf 100644
--- a/erts/doc/src/zlib.xml
+++ b/erts/doc/src/zlib.xml
@@ -302,7 +302,7 @@ list_to_binary([B1,B2])</pre>
<fsummary>Decompress data</fsummary>
<desc>
<p><c>inflate/2</c> decompresses as much data as possible.
- It may some introduce some output latency (reading
+ It may introduce some output latency (reading
input without producing any output).</p>
<p>If a preset dictionary is needed at this point (see
<c>inflateSetDictionary</c> below), <c>inflate/2</c> throws a