Merge branch 'maint-r14' into dev

1 files changed, 55 insertions, 15 deletions

diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml
index de5a3e5f4c..04c0c2accd 100644
--- a/lib/cosNotification/doc/src/notes.xml
+++ b/lib/cosNotification/doc/src/notes.xml
@@ -31,6 +31,46 @@
     <file>notes.xml</file>
   </header>
 
+  <section><title>cosNotification 1.1.15</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Switched from using the deprecated regexp to re instead.</p>
+          <p>
+	    Own Id: OTP-8846</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section>
+    <title>cosNotification 1.1.14</title>
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Test suites published.</p>
+          <p>
+            Own Id: OTP-8543 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
+          <p>Added missing trailing bracket to define in hrl-file.</p>
+          <p>Own Id: OTP-8489 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
   <section>
     <title>cosNotification 1.1.14</title>
     <section>
@@ -64,15 +104,15 @@
       <list type="bulleted">
         <item>
           <p>Removed superfluous VT in the documentation.</p>
-          <p>Own id: OTP-8353 Aux Id:</p>
+          <p>Own Id: OTP-8353 Aux Id:</p>
         </item>
         <item>
           <p>Removed superfluous backslash in the documentation.</p>
-          <p>Own id: OTP-8354 Aux Id:</p>
+          <p>Own Id: OTP-8354 Aux Id:</p>
         </item>
         <item>
           <p>The documentation EIX file was not generated.</p>
-          <p>Own id: OTP-8355 Aux Id:</p>
+          <p>Own Id: OTP-8355 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -104,7 +144,7 @@
         <item>
           <p>Obsolete guards, e.g. record vs is_record, has been changed
              to avoid compiler warnings.</p>
-          <p>Own id: OTP-7987</p>
+          <p>Own Id: OTP-7987</p>
         </item>
       </list>
     </section>
@@ -118,7 +158,7 @@
       <list type="bulleted">
         <item>
           <p>Updated file headers.</p>
-          <p>Own id: OTP-7837 Aux Id:</p>
+          <p>Own Id: OTP-7837 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -132,7 +172,7 @@
       <list type="bulleted">
         <item>
           <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595 Aux Id:</p>
+          <p>Own Id: OTP-7595 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -147,7 +187,7 @@
         <item>
           <p>The CosNotification proxy objects ignored the gcLimit option, instead
              the gcTime value was used.</p>
-          <p>Own id: OTP-7553 Aux Id:</p>
+          <p>Own Id: OTP-7553 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -161,7 +201,7 @@
       <list type="bulleted">
         <item>
           <p>Updated file headers.</p>
-          <p>Own id: OTP-7011</p>
+          <p>Own Id: OTP-7011</p>
         </item>
       </list>
     </section>
@@ -175,7 +215,7 @@
       <list type="bulleted">
         <item>
           <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own id: OTP-6754</p>
+          <p>Own Id: OTP-6754</p>
         </item>
       </list>
     </section>
@@ -189,7 +229,7 @@
       <list type="bulleted">
         <item>
           <p>Minor Makefile changes.</p>
-          <p>Own id: OTP-6701</p>
+          <p>Own Id: OTP-6701</p>
         </item>
       </list>
     </section>
@@ -203,7 +243,7 @@
       <list type="bulleted">
         <item>
           <p>Removed some unused code.</p>
-          <p>Own id: OTP-6527</p>
+          <p>Own Id: OTP-6527</p>
         </item>
       </list>
     </section>
@@ -219,7 +259,7 @@
           <p>A user can now define the QoS EventReliability to be 
             Persistent. Note, this is only a lightweight version
             and events will be lost if a proxy is terminated.</p>
-          <p>Own id: OTP-5923</p>
+          <p>Own Id: OTP-5923</p>
         </item>
       </list>
     </section>
@@ -235,7 +275,7 @@
           <p>Possible to configure cosNotification not to type check,
             by invoking corba_object:is_a/2, supplied IOR:s. When
             a type check fails, the feedback has been improved.</p>
-          <p>Own id: OTP-5823 Aux Id: seq10143</p>
+          <p>Own Id: OTP-5823 Aux Id: seq10143</p>
         </item>
       </list>
     </section>
@@ -249,7 +289,7 @@
       <list type="bulleted">
         <item>
           <p>The app-file contained duplicated modules.</p>
-          <p>Own id: OTP-4976</p>
+          <p>Own Id: OTP-4976</p>
         </item>
       </list>
     </section>
@@ -268,7 +308,7 @@
             Interface Repository. It is necessary to re-compile all IDL-files
             and use COS-applications, including Orber, compiled with
             IC-4.2.</p>
-          <p>Own id: OTP-4576</p>
+          <p>Own Id: OTP-4576</p>
         </item>
       </list>
     </section>