aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-11-27 19:42:46 +0100
committerSverker Eriksson <[email protected]>2013-11-27 19:42:46 +0100
commit06188473247fd1edc873d82cf07886fa7e53e8cb (patch)
tree9da8184924da8ba79c6c157acf0d878ab89a1cb4 /erts/doc/src
parent6603481b4612cdc83529cdecc86d5206b99674fd (diff)
parentf32368c4b34c86aa772a372cdb3c306a79127185 (diff)
downloadotp-06188473247fd1edc873d82cf07886fa7e53e8cb.tar.gz
otp-06188473247fd1edc873d82cf07886fa7e53e8cb.tar.bz2
otp-06188473247fd1edc873d82cf07886fa7e53e8cb.zip
Merge branch 'sverk/bin2term-bitstr-bugs/OTP-11479' into maint
* sverk/bin2term-bitstr-bugs/OTP-11479: erts: Fix bug in binary_to_term for binaries larger than 2^31 erts: Fix bugs in binary_to_term for invalid bitstrings
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erl_ext_dist.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/erl_ext_dist.xml b/erts/doc/src/erl_ext_dist.xml
index c6849f3326..64a201cc8f 100644
--- a/erts/doc/src/erl_ext_dist.xml
+++ b/erts/doc/src/erl_ext_dist.xml
@@ -1014,10 +1014,10 @@
</row>
<tcaption></tcaption></table>
<p>
- This term represents a bitstring whose length in bits is not a
- multiple of 8 (created using the bit syntax in R12B and later).
+ This term represents a bitstring whose length in bits does
+ not have to be a multiple of 8.
The <c>Len</c> field is an unsigned 4 byte integer (big endian).
- The <c>Bits</c> field is the number of bits that are used
+ The <c>Bits</c> field is the number of bits (1-8) that are used
in the last byte in the data field,
counting from the most significant bit towards the least
significant.