aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-09-30 13:27:30 +0200
committerHenrik Nord <[email protected]>2015-09-30 13:27:30 +0200
commit382b1fde9f28090a41344d4e66bdbd5a1f4a7327 (patch)
treed70220446cd0b2337e6f6976ae2c36355f836230 /erts
parent93b506afd35cc9edeebbad5da0c1624e2d3c0d92 (diff)
parent46178552c4622b29d5a70ca23d945e9036caa437 (diff)
downloadotp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.tar.gz
otp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.tar.bz2
otp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/erlang.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index e77532463e..2b12981b6d 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -2143,10 +2143,10 @@ os_prompt% </pre>
&lt;&lt;1,2,3&gt;&gt;
> <input>Bin2 = &lt;&lt;4,5&gt;&gt;.</input>
&lt;&lt;4,5&gt;&gt;
-> <input>Bin3 = &lt;&lt;6,7:4,&gt;&gt;.</input>
-&lt;&lt;6&gt;&gt;
+> <input>Bin3 = &lt;&lt;6,7:4&gt;&gt;.</input>
+&lt;&lt;6,7:4&gt;&gt;
> <input>list_to_bitstring([Bin1,1,[2,3,Bin2],4|Bin3]).</input>
-&lt;&lt;1,2,3,1,2,3,4,5,4,6,7:46&gt;&gt;</pre>
+&lt;&lt;1,2,3,1,2,3,4,5,4,6,7:4&gt;&gt;</pre>
</desc>
</func>
<func>