aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-03-18 13:14:00 +0100
committerZandra Hird <[email protected]>2015-03-18 13:14:00 +0100
commit16e35bfebd0e3283638b49718cbfeea17abd1d80 (patch)
tree34abee774876483ea8cf5b4e54cd1c273a41dbad
parentf6e280b426c38f6b6559934753b34b614c399710 (diff)
parente9d1e71bc978260b9888a4caac5dacf1c4c7174e (diff)
downloadotp-16e35bfebd0e3283638b49718cbfeea17abd1d80.tar.gz
otp-16e35bfebd0e3283638b49718cbfeea17abd1d80.tar.bz2
otp-16e35bfebd0e3283638b49718cbfeea17abd1d80.zip
Merge branch 'maint'
-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 b68115cd82..ed35ee3a9c 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>