aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2015-11-02 16:55:26 +0100
committerLukas Larsson <[email protected]>2015-11-02 16:55:26 +0100
commitaf19ef867f4a119b17d6d9cc6df7f448f7cc9715 (patch)
treee49c9b39e62f609c0f03fbc1efaf78e982b0d267
parentca1120b8cc473c0deb90a110dd0a08e5270ab3c3 (diff)
parent6a421403ce98d1863f416d9ca00b8f2de07b419a (diff)
downloadotp-af19ef867f4a119b17d6d9cc6df7f448f7cc9715.tar.gz
otp-af19ef867f4a119b17d6d9cc6df7f448f7cc9715.tar.bz2
otp-af19ef867f4a119b17d6d9cc6df7f448f7cc9715.zip
Merge branch 'maint'
-rw-r--r--lib/runtime_tools/doc/src/dbg.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/runtime_tools/doc/src/dbg.xml b/lib/runtime_tools/doc/src/dbg.xml
index 1a11806211..2065627026 100644
--- a/lib/runtime_tools/doc/src/dbg.xml
+++ b/lib/runtime_tools/doc/src/dbg.xml
@@ -1030,9 +1030,9 @@ hello</pre>
<fsummary>Stop the <c>dbg</c>server and the tracing of all processes.</fsummary>
<desc>
<p>Stops the <c>dbg</c> server and clears all trace flags for
- all processes and all trace patterns for all functions. Also
+ all processes and all local trace patterns for all functions. Also
shuts down all trace clients and closes all trace ports.</p>
- <p>Note that no trace patterns are affected by this
+ <p>Note that no global trace patterns are affected by this
function.</p>
</desc>
</func>
@@ -1040,8 +1040,7 @@ hello</pre>
<name>stop_clear() -> ok</name>
<fsummary>Stop the <c>dbg</c>server and the tracing of all processes, and clears trace patterns.</fsummary>
<desc>
- <p>Same as stop/0, but also clears all trace patterns on local
- and global functions calls.</p>
+ <p>Same as stop/0, but also clears all trace patterns on global functions calls.</p>
</desc>
</func>
</funcs>