aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-11-12 09:30:05 +0100
committerBruce Yinhe <[email protected]>2014-11-12 09:30:05 +0100
commite38e7f9bd7756037c9c42a4d97278fead0402629 (patch)
tree577a8e6c037cf174dd0435d47a9eadc2f471c742 /erts/doc/src
parent2f9fdd45fa120fb535252a79c50ec64dbf1f9972 (diff)
parent3b7508f6e75fd304736145528b53652f839a9b46 (diff)
downloadotp-e38e7f9bd7756037c9c42a4d97278fead0402629.tar.gz
otp-e38e7f9bd7756037c9c42a4d97278fead0402629.tar.bz2
otp-e38e7f9bd7756037c9c42a4d97278fead0402629.zip
Merge branch 's1n4/zlib_doc_typo' into maint
* s1n4/zlib_doc_typo: Fix a typo in the zlib documentation
Diffstat (limited to 'erts/doc/src')
-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