aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-10-30 12:11:11 +0100
committerHans Nilsson <[email protected]>2018-10-30 12:11:11 +0100
commita03b0b0298208216481fdc2a373e5cda893535d2 (patch)
tree9fe59060a40e63f4385c165d0b0da5d3ea9b23f9 /system
parent47433ac7a42651406b3f757af2ff2c5d2211a1a5 (diff)
parent3094642858ec071f9e98cfa666b82e06648b5266 (diff)
downloadotp-a03b0b0298208216481fdc2a373e5cda893535d2.tar.gz
otp-a03b0b0298208216481fdc2a373e5cda893535d2.tar.bz2
otp-a03b0b0298208216481fdc2a373e5cda893535d2.zip
Merge branch 'maint'
* maint: fix extra parameter in <type> Update profiling.xml Fix docs on gen_event optional callback
Diffstat (limited to 'system')
-rw-r--r--system/doc/efficiency_guide/profiling.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/doc/efficiency_guide/profiling.xml b/system/doc/efficiency_guide/profiling.xml
index cdc80289cf..5ec1f1be6e 100644
--- a/system/doc/efficiency_guide/profiling.xml
+++ b/system/doc/efficiency_guide/profiling.xml
@@ -94,7 +94,7 @@
<p>The above slogan is one of the more common reasons for Erlang to terminate.
For unknown reasons the Erlang Run-Time System failed to allocate memory to
use. When this happens a crash dump is generated that contains information
- about the state of the system as it ran out of mmeory. Use the
+ about the state of the system as it ran out of memory. Use the
<seealso marker="observer:cdv"><c>crashdump_viewer</c></seealso> to get a
view of the memory is being used. Look for processes with large heaps or
many messages, large ets tables, etc.</p>