aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-13 11:21:29 +0200
committerHenrik Nord <[email protected]>2015-10-13 11:21:29 +0200
commit2e36fbf17140c5a63c83b551a52a7e1ac6ab7345 (patch)
treea02de9b5e8f2822635703efb70d518f051839787 /lib
parent04960b9d82b7ff4aec535da4bb552bee2648f8f5 (diff)
parent10a6de6fbe038d2d8ac158d7bc3cf4858c26f2d9 (diff)
downloadotp-2e36fbf17140c5a63c83b551a52a7e1ac6ab7345.tar.gz
otp-2e36fbf17140c5a63c83b551a52a7e1ac6ab7345.tar.bz2
otp-2e36fbf17140c5a63c83b551a52a7e1ac6ab7345.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/os_mon/doc/src/cpu_sup.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/os_mon/doc/src/cpu_sup.xml b/lib/os_mon/doc/src/cpu_sup.xml
index 524426ce86..51e1a4c9d6 100644
--- a/lib/os_mon/doc/src/cpu_sup.xml
+++ b/lib/os_mon/doc/src/cpu_sup.xml
@@ -63,7 +63,7 @@
measure.</p>
<p>A server which receives just enough requests to never become
idle will score a CPU utilization of 100%. If the server receives
- 50% more requests, it will still scores 100%. When the system load
+ 50% more requests, it will still score 100%. When the system load
is calculated with the percentage formula shown previously,
the load will increase from 80% to 87%.</p>
<p>The <c>avg1/0</c>, <c>avg5/0</c>, and <c>avg15/0</c> functions