diff options
| author | Hans Nilsson <[email protected]> | 2018-10-30 12:11:11 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-10-30 12:11:11 +0100 |
| commit | a03b0b0298208216481fdc2a373e5cda893535d2 (patch) | |
| tree | 9fe59060a40e63f4385c165d0b0da5d3ea9b23f9 /lib/stdlib | |
| parent | 47433ac7a42651406b3f757af2ff2c5d2211a1a5 (diff) | |
| parent | 3094642858ec071f9e98cfa666b82e06648b5266 (diff) | |
| download | otp-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 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/doc/src/gen_event.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml index f793ec7fdf..fc34e51216 100644 --- a/lib/stdlib/doc/src/gen_event.xml +++ b/lib/stdlib/doc/src/gen_event.xml @@ -775,7 +775,7 @@ gen_event:stop -----> Module:terminate/2 <p>This callback is optional, so callback modules need not export it. The <c>gen_event</c> module provides a default implementation of this function that logs about the unexpected - <c>Info</c> message, drops it and returns <c>{noreply, State}</c>.</p> + <c>Info</c> message, drops it and returns <c>{ok, State}</c>.</p> </note> <p>This function is called for each installed event handler when an event manager receives any other message than an event or |