Merge branch 'nick/Cos-Apps/remove_shy_in_doc/OTP-9319' into dev

* nick/Cos-Apps/remove_shy_in_doc/OTP-9319:
  OTP-9319 Removed superfluous usage of shy in the documentation since it can cause problem if a buggy tool is used.

9 files changed, 27 insertions, 17 deletions

diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml
index 95941fefdd..2318ccb6d2 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml
@@ -23,8 +23,7 @@
   The Initial Developer of the Original Code is Ericsson AB.
     </legalnotice>
 
-    <title>CosEventChannelAdmin_&shy;ConsumerAdmin</title>
-    <shorttitle>..._ConsumerAdmin</shorttitle>
+    <title>CosEventChannelAdmin_ConsumerAdmin</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml
index 51f9f11613..4495fd4450 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml
@@ -23,8 +23,7 @@
   The Initial Developer of the Original Code is Ericsson AB.
     </legalnotice>
 
-    <title>CosEventChannelAdmin_&shy;EventChannel</title>
-    <shorttitle>..._EventChannel</shorttitle>
+    <title>CosEventChannelAdmin_EventChannel</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml
index 9690c9406d..4cd20ad185 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml
@@ -23,8 +23,7 @@
   The Initial Developer of the Original Code is Ericsson AB.
     </legalnotice>
 
-    <title>CosEventChannelAdmin_&shy;ProxyPullConsumer</title>
-    <shorttitle>..._ProxyPullConsumer</shorttitle>
+    <title>CosEventChannelAdmin_ProxyPullConsumer</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml
index fb17c450f4..830c06a87c 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml
@@ -23,8 +23,7 @@
   The Initial Developer of the Original Code is Ericsson AB.
     </legalnotice>
 
-    <title>CosEventChannelAdmin_&shy;ProxyPullSupplier</title>
-    <shorttitle>..._ProxyPullSupplier</shorttitle>
+    <title>CosEventChannelAdmin_ProxyPullSupplier</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml
index 21e6cfce6f..2c451acd9c 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml
@@ -23,8 +23,7 @@
   The Initial Developer of the Original Code is Ericsson AB.
     </legalnotice>
 
-    <title>CosEventChannelAdmin_&shy;ProxyPushConsumer</title>
-    <shorttitle>..._ProxyPushConsumer</shorttitle>
+    <title>CosEventChannelAdmin_ProxyPushConsumer</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml
index be2dfcafbe..9030c0e735 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml
@@ -23,8 +23,7 @@
   The Initial Developer of the Original Code is Ericsson AB.
     </legalnotice>
 
-    <title>CosEventChannelAdmin_&shy;ProxyPushSupplier</title>
-    <shorttitle>..._ProxyPushSupplier</shorttitle>
+    <title>CosEventChannelAdmin_ProxyPushSupplier</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml
index ca301bb860..e68b0854d8 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml
@@ -23,8 +23,7 @@
   The Initial Developer of the Original Code is Ericsson AB.
     </legalnotice>
 
-    <title>CosEventChannelAdmin_&shy;SupplierAdmin</title>
-    <shorttitle>..._SupplierAdmin</shorttitle>
+    <title>CosEventChannelAdmin_SupplierAdmin</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
diff --git a/lib/cosEvent/doc/src/notes.xml b/lib/cosEvent/doc/src/notes.xml
index 1a5c8afa17..1da5399755 100644
--- a/lib/cosEvent/doc/src/notes.xml
+++ b/lib/cosEvent/doc/src/notes.xml
@@ -22,8 +22,8 @@
     </legalnotice>
 
     <title>cosEvent Release Notes</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
+    <prepared></prepared>
+    <responsible></responsible>
     <docno></docno>
     <approved></approved>
     <checked></checked>
@@ -33,6 +33,23 @@
   </header>
 
   <section>
+    <title>cosEvent 2.1.11</title>
+
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Removed superfluous usage of shy in the documentation since it can cause problem if
+            a buggy tool is used.</p>
+          <p>
+            Own Id: OTP-9319 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
     <title>cosEvent 2.1.10</title>
 
     <section>
diff --git a/lib/cosEvent/vsn.mk b/lib/cosEvent/vsn.mk
index 38999db5fa..85d3cf552b 100644
--- a/lib/cosEvent/vsn.mk
+++ b/lib/cosEvent/vsn.mk
@@ -1,3 +1,3 @@
 
-COSEVENT_VSN = 2.1.10
+COSEVENT_VSN = 2.1.11