aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-13 11:21:14 +0200
committerHenrik Nord <[email protected]>2015-10-13 11:21:14 +0200
commit10a6de6fbe038d2d8ac158d7bc3cf4858c26f2d9 (patch)
tree564cdc0712dfd1444ddc301fdc86392f4b7287a4
parent981dd4509dbabcf3af3d4df611163987e10bca41 (diff)
parente4ee8ea94407726d36de6146878ca21cff6e1854 (diff)
downloadotp-10a6de6fbe038d2d8ac158d7bc3cf4858c26f2d9.tar.gz
otp-10a6de6fbe038d2d8ac158d7bc3cf4858c26f2d9.tar.bz2
otp-10a6de6fbe038d2d8ac158d7bc3cf4858c26f2d9.zip
Merge branch 'scrapinghub/qrilka-patch-1' into maint
* scrapinghub/qrilka-patch-1: Small misprint OTP-13043
-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