diff options
| author | Björn Gustavsson <[email protected]> | 2017-02-15 10:24:24 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-02-15 10:24:24 +0100 |
| commit | 0eb04da53fea8d56592f73dccacd1aa62fe672df (patch) | |
| tree | 8d8d22d880bc3425053f8975fa3096cc1e40525a /erts/emulator/beam/bif.c | |
| parent | 6214dbede3ae21c661408a54278787c7d9a62d9e (diff) | |
| parent | 45f9ea530c40aa771bc3549894863b981c9f8e7b (diff) | |
| download | otp-0eb04da53fea8d56592f73dccacd1aa62fe672df.tar.gz otp-0eb04da53fea8d56592f73dccacd1aa62fe672df.tar.bz2 otp-0eb04da53fea8d56592f73dccacd1aa62fe672df.zip | |
Merge branch 'fix-source-typos'
* fix-source-typos: (25 commits)
Fixed typos in system/doc
Fixed typos in lib/xmerl
Fixed typos in lib/wx
Fixed typos in lib/stdlib
Fixed typos in lib/snmp
Fixed typos in lib/ssl
Fixed typos in lib/ssh
Fixed typos in PKCS-8.asn1 file
Fixed typos in lib/parsetools
Fixed typos in lib/orber
Fixed typos in lib/mnesia
Fixed typos in lib/megaco
Fixed typos in lib/kernel
Fixed typos in lib/jinterface
Fixed typos in lib/inets
Fixed typos in lib/hipe
Fixed typos in lib/eunit
Fixed typos in lib/erl_interface
Fixed typos in lib/eldap
Fixed typos in lib/edoc
...
Diffstat (limited to 'erts/emulator/beam/bif.c')
| -rw-r--r-- | erts/emulator/beam/bif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index 2190c47262..4c9b9887c1 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -467,7 +467,7 @@ demonitor_local_port(Process *origin, Eterm ref, Eterm target) } /* Can return atom true, false, yield, internal_error, badarg or - * THE_NON_VALUE if error occured or trap has been set up + * THE_NON_VALUE if error occurred or trap has been set up */ static BIF_RETTYPE demonitor(Process *c_p, Eterm ref, Eterm *multip) @@ -597,7 +597,7 @@ BIF_RETTYPE demonitor_2(BIF_ALIST_2) switch (demonitor(BIF_P, BIF_ARG_1, &multi)) { case THE_NON_VALUE: - /* If other error occured or trap has been set up - pass through */ + /* If other error occurred or trap has been set up - pass through */ BIF_RET(THE_NON_VALUE); case am_false: if (info) |