aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/efficiency_guide/binaryhandling.xml
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-03-25 14:55:50 +0100
committerHenrik Nord <[email protected]>2011-03-25 14:55:50 +0100
commit21a514ba7842380973fd4c4006d6cf71403d021e (patch)
treece4332309bdb5e53706d7782ac954a8eaee85724 /system/doc/efficiency_guide/binaryhandling.xml
parentad99d0e01d9c61dfad5e8a32dc587b61e2409edb (diff)
parent179de7d370b9e0398500d7d0e5ae34dd2ad6c619 (diff)
downloadotp-21a514ba7842380973fd4c4006d6cf71403d021e.tar.gz
otp-21a514ba7842380973fd4c4006d6cf71403d021e.tar.bz2
otp-21a514ba7842380973fd4c4006d6cf71403d021e.zip
Merge branch 'ta/doc-fixes' into dev
* ta/doc-fixes: Fix two typos in erlsrv log messages Fix typo in epmd help Fix typo in binary:part/2 example Fix typos in efficiency guide erts: Fix doc typos, duplication and readability Fix inet:port/1 doc to match implementation/spec Fix typos in zip manpage
Diffstat (limited to 'system/doc/efficiency_guide/binaryhandling.xml')
-rw-r--r--system/doc/efficiency_guide/binaryhandling.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/doc/efficiency_guide/binaryhandling.xml b/system/doc/efficiency_guide/binaryhandling.xml
index 3628d7a232..425d6308cf 100644
--- a/system/doc/efficiency_guide/binaryhandling.xml
+++ b/system/doc/efficiency_guide/binaryhandling.xml
@@ -114,7 +114,7 @@ my_binary_to_list(<<>>) -> [].]]></code>
data. For each field that is matched out of a binary, the position in the
match context will be incremented.</p>
- <p>In R11B, a match context was only using during a binary matching
+ <p>In R11B, a match context was only used during a binary matching
operation.</p>
<p>In R12B, the compiler tries to avoid generating code that
@@ -205,7 +205,7 @@ Bin4 = <<Bin1/binary,17>>, %% 5 !!!
ProcBin for the binary. The reason is that the binary object can be
moved (reallocated) during an append operation, and when that happens
the pointer in the ProcBin must be updated. If there would be more than
- on ProcBin pointing to the binary object, it would not be possible to
+ one ProcBin pointing to the binary object, it would not be possible to
find and update all of them.</p>
<p>Therefore, certain operations on a binary will mark it so that
@@ -291,7 +291,7 @@ my_binary_to_list(<<>>) -> [].]]></code>
that initializes the matching operation will basically do nothing
when it sees that it was passed a match context instead of a binary.</p>
- <p>When the end of the binary is reached and second clause matches,
+ <p>When the end of the binary is reached and the second clause matches,
the match context will simply be discarded (removed in the next
garbage collection, since there is no longer any reference to it).</p>