aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/doc
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2018-10-24 12:55:12 +0200
committerBjörn Gustavsson <[email protected]>2018-10-24 12:55:12 +0200
commit58bea75b67754f1aeee2bccb537b50c0430ba08b (patch)
tree84cea5e436f453ecc378d6e4eec3571edc470131 /lib/stdlib/doc
parent8d34db5c230660f42bd146b6db23096c015c221d (diff)
parentc37f7a2215646c85c1ae12303f07bc9bc27b75ae (diff)
downloadotp-58bea75b67754f1aeee2bccb537b50c0430ba08b.tar.gz
otp-58bea75b67754f1aeee2bccb537b50c0430ba08b.tar.bz2
otp-58bea75b67754f1aeee2bccb537b50c0430ba08b.zip
Merge branch 'maint'
* maint: beam_lib: Remove obsolete module() from the beam() type hipe: Don't use beam_lib:info/1 with an atom as filename Honor the max heap size when copying literals after purging
Diffstat (limited to 'lib/stdlib/doc')
-rw-r--r--lib/stdlib/doc/src/beam_lib.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml
index 26d0724aaf..213170df7f 100644
--- a/lib/stdlib/doc/src/beam_lib.xml
+++ b/lib/stdlib/doc/src/beam_lib.xml
@@ -180,8 +180,8 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
<name name="beam"/>
<desc>
<p>Each of the functions described below accept either the
- module name, the filename, or a binary containing the BEAM
- module.</p>
+ filename (as a string) or a binary containing the BEAM
+ module.</p>
</desc>
</datatype>
<datatype>