aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-10-31 11:18:10 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-10-31 11:18:10 +0100
commit1d53aca8adc0283f136c0a67b0c1ab13e39de4fa (patch)
treed0aaae703a538cc6027f85ac291587a58be472ee /erts
parent6b0a65a4f25659b358d328c0cecf7d06cc98962b (diff)
parent8670c400170a08c742ea6b133517abd160a18b05 (diff)
downloadotp-1d53aca8adc0283f136c0a67b0c1ab13e39de4fa.tar.gz
otp-1d53aca8adc0283f136c0a67b0c1ab13e39de4fa.tar.bz2
otp-1d53aca8adc0283f136c0a67b0c1ab13e39de4fa.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/erl_driver.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index 5191742bc9..d8bf45c523 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -2039,7 +2039,7 @@ r = driver_async(myPort, &myKey, myData, myFunc); ]]></code>
<fsummary>Set and get limits for busy port message queue.</fsummary>
<desc>
<marker id="erl_drv_busy_msgq_limits"></marker>
- <p>Sets and gets limits that will be used for controling the
+ <p>Sets and gets limits that will be used for controlling the
busy state of the port message queue.</p>
<p>The port message queue is set into a busy
state when the amount of command data queued on the
@@ -2112,7 +2112,7 @@ r = driver_async(myPort, &myKey, myData, myFunc); ]]></code>
It is used to identify the condition variable in planned
future debug functionality.</p>
<p>Returns <c>NULL</c> on failure. The driver
- creating the condition variable is responsibile for
+ creating the condition variable is responsible for
destroying it before the driver is unloaded.</p>
<p>This function is thread-safe.</p>
</desc>