From e09dd66dc4d89c62ddfd8c19791f9678d5d787c6 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 12 May 2015 18:18:55 +0200
Subject: Prepare release

---
 lib/inets/doc/src/notes.xml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'lib/inets/doc')

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 12bbc2b736..7939787601 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,7 +32,26 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 5.10.7</title>
+  <section><title>Inets 6.0</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Remove Server Side Include support from inets, as this is
+	    an old technic that has security issues and was not well
+	    tested.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-12156</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 5.10.7</title>
 
     <section><title>Improvements and New Features</title>
       <list>
-- 
cgit v1.2.3