aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/doc
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-03-27 10:09:36 +0100
committerLukas Larsson <[email protected]>2014-03-27 10:09:36 +0100
commit70d60cb4d825464149ca48fdeeb350ac4689cc00 (patch)
treeb522a9bd6bf2eb7bb4b4f3911bebb92e070183ac /lib/stdlib/doc
parented483c484f1752151e73ed0c060b61312e59a397 (diff)
parentbe34551be2119a6c3c1a7edf113b7db12789423b (diff)
downloadotp-70d60cb4d825464149ca48fdeeb350ac4689cc00.tar.gz
otp-70d60cb4d825464149ca48fdeeb350ac4689cc00.tar.bz2
otp-70d60cb4d825464149ca48fdeeb350ac4689cc00.zip
Merge branch 'pf/document-escript-feature-only-present-in-examples/OTP-11827'
* pf/document-escript-feature-only-present-in-examples/OTP-11827: Document an escript:create/2 hidden feature
Diffstat (limited to 'lib/stdlib/doc')
-rw-r--r--lib/stdlib/doc/src/zip.xml13
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml
index 66c21da193..48b376743d 100644
--- a/lib/stdlib/doc/src/zip.xml
+++ b/lib/stdlib/doc/src/zip.xml
@@ -123,6 +123,18 @@
</taglist>
</desc>
</datatype>
+ <datatype>
+ <name name="filename"/>
+ <p>The name of a zip file.</p>
+ </datatype>
+ <datatype><name name="extension"/></datatype>
+ <datatype><name name="extension_spec"/></datatype>
+ <datatype>
+ <name name="create_option"/>
+ <desc>
+ <p>These options are described in <seealso marker="#zip_options">create/3</seealso>.</p>
+ </desc>
+ </datatype>
</datatypes>
<funcs>
<func>
@@ -160,6 +172,7 @@
set to <c>["gif", "jpg"]</c> and <c>uncompress</c> is set to
<c>["jpg"]</c>, only files with <c>"gif"</c> as extension will
be compressed. No other files will be compressed.</p>
+ <marker id="zip_options"></marker>
<p>The following options are available:</p>
<taglist>
<tag><c>cooked</c></tag>