aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-09-05 09:49:59 +0200
committerIngela Anderton Andin <[email protected]>2014-09-05 09:49:59 +0200
commit38f49f460ffee0f6f3cbfef129c76e160c63d1a4 (patch)
tree7ee410b853ca2ad861c60409fa4fc5d65c3636a9 /system
parent8ad5bd0ef8143f5ac32bd2df11d59a20e7eb0527 (diff)
parent35ff91189c8dd4ceed3d8f29536f500787ba4782 (diff)
downloadotp-38f49f460ffee0f6f3cbfef129c76e160c63d1a4.tar.gz
otp-38f49f460ffee0f6f3cbfef129c76e160c63d1a4.tar.bz2
otp-38f49f460ffee0f6f3cbfef129c76e160c63d1a4.zip
Merge branch 'maint' of git-server:otp into maint
Diffstat (limited to 'system')
-rw-r--r--system/doc/efficiency_guide/binaryhandling.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/system/doc/efficiency_guide/binaryhandling.xml b/system/doc/efficiency_guide/binaryhandling.xml
index 6b0df49011..4ba1378059 100644
--- a/system/doc/efficiency_guide/binaryhandling.xml
+++ b/system/doc/efficiency_guide/binaryhandling.xml
@@ -5,7 +5,7 @@
<header>
<copyright>
<year>2007</year>
- <year>2013</year>
+ <year>2014</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>
@@ -237,8 +237,9 @@ Bin = <<Bin1,...>> %% Bin1 will be COPIED
<p><c>Bin1</c> will be copied in the third line.</p>
<p>The same thing happens if you insert a binary into an <em>ets</em>
- table or send it to a port using <c>erlang:port_command/2</c>.</p>
-
+ table or send it to a port using <c>erlang:port_command/2</c> or pass it to
+ <seealso marker="erts:erl_nif#enif_inspect_binary">enif_inspect_binary</seealso>
+ in a NIF.</p>
<p>Matching a binary will also cause it to shrink and the next append
operation will copy the binary data:</p>