aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-08-29 16:10:02 +0200
committerHenrik Nord <[email protected]>2012-08-29 16:10:10 +0200
commit2890aeb643cc8ac0b46eebebb2f26e7d348bbea1 (patch)
tree32f40dbe3bc70cad62ea0fd2688be4a764d7177d /erts/emulator/beam
parent293364854f6a404434bd221f4b64dcb4fb846bbf (diff)
parent541e986798f525add633b55349168eb1c75aa5cf (diff)
downloadotp-2890aeb643cc8ac0b46eebebb2f26e7d348bbea1.tar.gz
otp-2890aeb643cc8ac0b46eebebb2f26e7d348bbea1.tar.bz2
otp-2890aeb643cc8ac0b46eebebb2f26e7d348bbea1.zip
Merge branch 'ta/docsmaint' into maint
* ta/docsmaint: Fix various doc typos for R15B02 Fix various code typos for R15B02 OTP-10245
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_time_sup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index f90daadadc..a44401d7b1 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -351,7 +351,7 @@ static int clock_resolution;
/*
** The clock resolution should really be the resolution of the
** time function in use, which on most platforms
-** is 1. On VxWorks the resolution shold be
+** is 1. On VxWorks the resolution should be
** the number of ticks per second (or 1, which would work nicely to).
**
** Setting lower resolutions is mostly interesting when timers are used