aboutsummaryrefslogtreecommitdiffstats
path: root/erts/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 /erts/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 'erts/doc')
-rw-r--r--erts/doc/src/escript.xml9
1 files changed, 7 insertions, 2 deletions
diff --git a/erts/doc/src/escript.xml b/erts/doc/src/escript.xml
index 1abbdb2180..9159d68f60 100644
--- a/erts/doc/src/escript.xml
+++ b/erts/doc/src/escript.xml
@@ -236,8 +236,13 @@ factorial 5 = 120
<v>EmuArgs = string() | 'undefined'</v>
<v>Body = {source, SourceCode}
| {beam, BeamCode}
- | {archive, ZipArchive}</v>
- <v>SourceCode = BeamCode = ZipArchive = binary()</v>
+ | {archive, ZipArchive}
+ | {archive, ZipFiles, ZipOptions}</v>
+ <v>SourceCode = BeamCode = file:filename() | binary()</v>
+ <v>ZipArchive = <seealso marker="stdlib:zip#type-filename">zip:filename()</seealso> | binary()</v>
+ <v>ZipFiles = [ZipFile]</v>
+ <v>ZipFile = file:filename() | {file:filename(), binary()} | {file:filename(), binary(), file:file_info()}</v>
+ <v>ZipOptions = [<seealso marker="stdlib:zip#type-create_option">zip:create_option()</seealso>]</v>
</type>
<desc>
<p>The <marker id="create_2"></marker> <c>create/2</c>