diff options
| author | Lukas Larsson <[email protected]> | 2014-03-27 10:09:36 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-03-27 10:09:36 +0100 |
| commit | 70d60cb4d825464149ca48fdeeb350ac4689cc00 (patch) | |
| tree | b522a9bd6bf2eb7bb4b4f3911bebb92e070183ac /lib/stdlib/src/escript.erl | |
| parent | ed483c484f1752151e73ed0c060b61312e59a397 (diff) | |
| parent | be34551be2119a6c3c1a7edf113b7db12789423b (diff) | |
| download | otp-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/src/escript.erl')
| -rw-r--r-- | lib/stdlib/src/escript.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl index a8a82272d6..6bd0eb8a22 100644 --- a/lib/stdlib/src/escript.erl +++ b/lib/stdlib/src/escript.erl @@ -59,7 +59,6 @@ file:filename() | {file:filename(), binary()} | {file:filename(), binary(), file:file_info()}. --type zip_create_option() :: term(). -type section() :: shebang | {shebang, shebang() | default | undefined} @@ -68,8 +67,8 @@ | {emu_args, emu_args() | undefined} | {source, file:filename() | binary()} | {beam, file:filename() | binary()} - | {archive, file:filename() | binary()} - | {archive, [zip_file()], [zip_create_option()]}. + | {archive, zip:filename() | binary()} + | {archive, [zip_file()], [zip:create_option()]}. %%----------------------------------------------------------------------- |