aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-06-03 14:37:33 +0200
committerHenrik Nord <[email protected]>2015-06-03 14:37:33 +0200
commit554849eed360bc5287992196644c6273dbb0caba (patch)
tree80072b24388c314e001bbe3c4bc54557e1fa2fb9 /lib/megaco
parent2c323bd46cecd0592a47e32e4b57f3b6600b828d (diff)
parent69dfa5599dc72db8addcad0f3b42a2b6716676ab (diff)
downloadotp-554849eed360bc5287992196644c6273dbb0caba.tar.gz
otp-554849eed360bc5287992196644c6273dbb0caba.tar.bz2
otp-554849eed360bc5287992196644c6273dbb0caba.zip
Merge branch 'scrapinghub/async-typo'
* scrapinghub/async-typo: Typo 'asynchroneous' fix
Diffstat (limited to 'lib/megaco')
-rw-r--r--lib/megaco/doc/src/megaco.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/megaco/doc/src/megaco.xml b/lib/megaco/doc/src/megaco.xml
index dff1c3afc6..0a8dfe8a13 100644
--- a/lib/megaco/doc/src/megaco.xml
+++ b/lib/megaco/doc/src/megaco.xml
@@ -336,7 +336,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
<tag><c><![CDATA[request_keep_alive_timeout]]></c></tag>
<item>
<p>Specifies the timeout time for the request-keep-alive timer. </p>
- <p>This timer is started when the <em>first</em> reply to an asynchroneous
+ <p>This timer is started when the <em>first</em> reply to an asynchronous
request (issued using the
<seealso marker="megaco#cast">megaco:cast/3</seealso> function)
arrives. As long as this timer is running, replies will
@@ -837,7 +837,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
<tag><c><![CDATA[request_keep_alive_timeout]]></c></tag>
<item>
<p>Specifies the timeout time for the request-keep-alive timer. </p>
- <p>This timer is started when the <em>first</em> reply to an asynchroneous
+ <p>This timer is started when the <em>first</em> reply to an asynchronous
request (issued using the
<seealso marker="megaco#cast">megaco:cast/3</seealso> function)
arrives. As long as this timer is running, replies will