Removed the usage of the codeinclude tag in the documentation.

3 files changed, 28 insertions, 19 deletions

diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin.xml
index 25f2dc805b..c599a92ff1 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin.xml
@@ -4,23 +4,21 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year>
-      <year>2007</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
+      <year>1997</year><year>2010</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-  The contents of this file are subject to the Erlang Public License,
-  Version 1.1, (the "License"); you may not use this file except in
-  compliance with the License. You should have received a copy of the
-  Erlang Public License along with this software. If not, it can be
-  retrieved online at http://www.erlang.org/.
+      The contents of this file are subject to the Erlang Public License,
+      Version 1.1, (the "License"); you may not use this file except in
+      compliance with the License. You should have received a copy of the
+      Erlang Public License along with this software. If not, it can be
+      retrieved online at http://www.erlang.org/.
 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and limitations
-  under the License.
+      Software distributed under the License is distributed on an "AS IS"
+      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+      the License for the specific language governing rights and limitations
+      under the License.
 
-  The Initial Developer of the Original Code is Ericsson AB.
     </legalnotice>
 
     <title>CosEventChannelAdmin</title>
@@ -73,8 +71,6 @@
       <item>SupplierAdmin</item>
       <item>EventChannel</item>
     </list>
-    <p>IDL specification for CosEventChannelAdmin:</p>
-    <codeinclude file="../../src/CosEventChannelAdmin.idl" tag="" type="c"></codeinclude>
   </description>
   
 </erlref>
diff --git a/lib/cosEvent/doc/src/notes.xml b/lib/cosEvent/doc/src/notes.xml
index 8cd7b9dd48..78299a38dc 100644
--- a/lib/cosEvent/doc/src/notes.xml
+++ b/lib/cosEvent/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>cosEvent Release Notes</title>
@@ -36,6 +36,18 @@
     <title>cosEvent 2.1.8</title>
 
     <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Removed the usage of the codeinclude tag in the documentation.</p>
+          <p>
+            Own Id: OTP-8409 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+
+    <section>
       <title>Fixed Bugs and Malfunctions</title>
       <list type="bulleted">
         <item>
diff --git a/lib/cosEvent/vsn.mk b/lib/cosEvent/vsn.mk
index 7c908d1c5d..8915903bbe 100644
--- a/lib/cosEvent/vsn.mk
+++ b/lib/cosEvent/vsn.mk
@@ -1,7 +1,8 @@
 
 COSEVENT_VSN = 2.1.8
 
-TICKETS = OTP-8355
+TICKETS = OTP-8355 \
+	OTP-8409
 
 TICKETS_2.1.7 = OTP-8201