aboutsummaryrefslogtreecommitdiffstats
path: root/lib/eldap
diff options
context:
space:
mode:
authorZandra Hird <zandra@erlang.org>2015-03-18 13:13:30 +0100
committerZandra Hird <zandra@erlang.org>2015-03-18 13:13:30 +0100
commite9d1e71bc978260b9888a4caac5dacf1c4c7174e (patch)
tree95269d3c96ea64615b48cbdec6785bfba775a2df /lib/eldap
parent6b61df94b7f6eaef0b5c3fec3499ebf84bd1847c (diff)
parent59649f4ed214458105700d6b6e8d8f44f2f200ee (diff)
downloadotp-e9d1e71bc978260b9888a4caac5dacf1c4c7174e.tar.gz
otp-e9d1e71bc978260b9888a4caac5dacf1c4c7174e.tar.bz2
otp-e9d1e71bc978260b9888a4caac5dacf1c4c7174e.zip
Merge branch 'jeffweiss/fix_eldap_doc_infinity_typo' into maint
* jeffweiss/fix_eldap_doc_infinity_typo: fix `infinity` typo in eldap docs
Diffstat (limited to 'lib/eldap')
-rw-r--r--lib/eldap/doc/src/eldap.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index c4b1ac36ca..945379d5d2 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -103,7 +103,7 @@ filter() See present/1, substrings/2,
<type>
<v>Handle = handle()</v>
<v>Options = ssl:ssl_options()</v>
- <v>Timeout = inifinity | positive_integer()</v>
+ <v>Timeout = infinity | positive_integer()</v>
</type>
<desc>
<p>Upgrade the connection associated with <c>Handle</c> to a tls connection if possible.</p>