aboutsummaryrefslogtreecommitdiffstats
path: root/lib/runtime_tools/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-20 11:19:21 +0200
committerHenrik Nord <[email protected]>2011-09-20 11:19:21 +0200
commitec36499d7e329b4dc69a1a3be3422eac7907c260 (patch)
tree3fae5bd47f85aa8a3ac40519b2328c4451a00c18 /lib/runtime_tools/doc/src
parent532c72b3ffeb9219bdb7e6a7f5d21fe26f0f0629 (diff)
parent53cf0b70c705e0bf6c09f83f2ce2709d79593ce6 (diff)
downloadotp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.gz
otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.bz2
otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.zip
Merge branch 'dev' into major
Conflicts: erts/aclocal.m4 erts/include/internal/ethread_header_config.h.in
Diffstat (limited to 'lib/runtime_tools/doc/src')
-rw-r--r--lib/runtime_tools/doc/src/dbg.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/runtime_tools/doc/src/dbg.xml b/lib/runtime_tools/doc/src/dbg.xml
index a17896e4ff..c7c5cd4ff0 100644
--- a/lib/runtime_tools/doc/src/dbg.xml
+++ b/lib/runtime_tools/doc/src/dbg.xml
@@ -723,7 +723,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
value from the last invocation of the fun. The initial value
of the second parameter is specified in the <c>InitialData</c>
part of the <c>HandlerSpec</c>. The <c>HandlerFun</c> may
- chose any appropriate action to take when invoked, and can
+ choose any appropriate action to take when invoked, and can
save a state for the next invocation by returning it.
</p>
<p>If <c>Type</c> is a port, then the second parameter should
@@ -783,7 +783,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
<p>This function creates a trace port generating <em>fun</em>.
The <em>fun</em> takes no arguments and returns a newly opened
trace port. The return value from this function is suitable as
- a second parameter to tracer/2, i. e. <c>dbg:tracer(port, dbg:trace_port(ip, 4711))</c>. </p>
+ a second parameter to tracer/2, i.e. <c>dbg:tracer(port, dbg:trace_port(ip, 4711))</c>. </p>
<p>A trace port is an
Erlang port to a dynamically linked in driver that handles
trace messages directly, without the overhead of sending them
@@ -869,9 +869,9 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard) c
<desc>
<p>This function is used to do a control operation on the
active trace port driver on the given node
- (<c>Nodename</c>). Which operations that are allowed as well
- as their return values are depending on which trace driver
- that is used.</p>
+ (<c>Nodename</c>). Which operations are allowed as well
+ as their return values depend on which trace driver
+ is used.</p>
<p>Returns either <c>ok</c> or <c>{ok, Result}</c>
if the operation was successful, or <c>{error, Reason}</c>
if the current tracer is a process