From 60ab72f5c4770e3f66611c88797c9608b8e516f2 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 17 Sep 2014 14:34:36 +0200
Subject: eldap: Enable all tcp options in eldap:open

Options: OTP-12171
Correct error msgs for Options: OTP-12182
---
 lib/eldap/doc/src/eldap.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/eldap/doc')

diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index 8009a8d6a3..dbd478fb17 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -75,7 +75,9 @@ filter()    See present/1, substrings/2,
         <p>Setup a connection to an LDAP server, the <c>HOST</c>'s are tried in order.</p>
 	<p>The log function takes three arguments, <c>fun(Level, FormatString, [FormatArg]) end</c>.</p>
 	<p>Timeout set the maximum time in milliseconds that each server request may take.</p>
-        <p>Currently, the only TCP socket option accepted is <c>inet6</c>. Default is <c>inet</c>.</p>
+	<p>All TCP socket options are accepted except 
+	  <c>active</c>, <c>binary</c>, <c>deliver</c>, <c>list</c>, <c>mode</c> and <c>packet</c>
+	</p>
       </desc>
     </func>
     <func>
-- 
cgit v1.2.3


From 782fbece2e903c09b5293113bcb85f988be6f84c Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 29 Sep 2014 09:00:20 +0200
Subject: Prepare release

---
 lib/eldap/doc/src/notes.xml | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'lib/eldap/doc')

diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index 089bb731d4..f92d100757 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -30,7 +30,36 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
-  <section><title>Eldap 1.0.3</title>
+  <section><title>Eldap 1.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    <c>eldap:open/2</c> and <c>eldap:open/3</c> gave wrong
+	    return values for option errors.</p>
+          <p>
+	    Own Id: OTP-12182</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Nearly all TCP options are possible to give in the
+	    <c>eldap:open/2</c> call.</p>
+          <p>
+	    Own Id: OTP-12171</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Eldap 1.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
-- 
cgit v1.2.3