From 62081266545df8f5eda8e2043f33055cfe575126 Mon Sep 17 00:00:00 2001
From: Henrik Nord
Date: Fri, 25 Jul 2014 09:11:35 +0200
Subject: fix xml file merge messup
---
lib/kernel/doc/src/notes.xml | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
(limited to 'lib')
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index b75644a847..f92770603a 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -151,7 +151,6 @@
-
Improvements and New Features
-
@@ -292,25 +291,29 @@
corrected.
Thanks to Max Treskin.
Own Id: OTP-11730
-Kernel 2.16.4.1
-
- Known Bugs and Problems
-
- -
-
- When using gen_tcp:connect and the fd option with
- port and/or ip, the port and
- ip options were ignored. This has been fixed so
- that if port and/or ip is specified
- together with fd a bind is requested for that
- fd. If port and/or ip is not
- specified bind will not be called.
-
- Own Id: OTP-12061
+
+Kernel 2.16.4.1
+
+ Known Bugs and Problems
+
+ -
+
+ When using gen_tcp:connect and the fd option with
+ port and/or ip, the port and
+ ip options were ignored. This has been fixed so
+ that if port and/or ip is specified
+ together with fd a bind is requested for that
+ fd. If port and/or ip is not
+ specified bind will not be called.
+
+ Own Id: OTP-12061
+
+
+
Kernel 2.16.4
--
cgit v1.2.3