aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-05-20 10:33:36 +0200
committerHenrik Nord <[email protected]>2015-05-20 10:33:36 +0200
commitfa4cb9250fb987528d650834dfeb7c96104979d0 (patch)
tree2c15b444460cbfa7023199f6fdd601f053e379be
parent7b81ed532898c735ad8901723df373e5f0246127 (diff)
parent0a4ef21233b03a551e06798f763b4b817d973d1c (diff)
downloadotp-fa4cb9250fb987528d650834dfeb7c96104979d0.tar.gz
otp-fa4cb9250fb987528d650834dfeb7c96104979d0.tar.bz2
otp-fa4cb9250fb987528d650834dfeb7c96104979d0.zip
Merge branch 'jeffweiss/fix_eldap_timeout_documentation'
* jeffweiss/fix_eldap_timeout_documentation: Correct module in eldap timeout docs
-rw-r--r--lib/eldap/doc/src/eldap.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index a6fad8a857..253ba7c2ff 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -121,7 +121,7 @@ filter() See present/1, substrings/2,
<item>Any error responded from ssl:connect/3</item>
</taglist>
<p>The <c>Timeout</c> parameter is for the actual tls upgrade (phase 2) while the timeout in
- <seealso marker="#open/2">erl_tar:open/2</seealso> is used for the initial negotiation about
+ <seealso marker="#open/2">eldap:open/2</seealso> is used for the initial negotiation about
upgrade (phase 1).
</p>
</desc>
@@ -298,7 +298,7 @@ filter() See present/1, substrings/2,
search(Handle, [{base, "dc=example, dc=com"}, {filter, Filter}, {attributes, ["cn"]}]),
</pre>
<p>The <c>timeout</c> option in the <c>SearchOptions</c> is for the ldap server, while
- the timeout in <seealso marker="#open/2">erl_tar:open/2</seealso> is used for each
+ the timeout in <seealso marker="#open/2">eldap:open/2</seealso> is used for each
individual request in the search operation.
</p>
</desc>