NO-JIRA: [JMS Client 0-8 documentation] Correct pub/sub example to use a integer price property (suitable for the inequality in the example's message selector). Correct typo in 'Maximum Delivery Count' section and add note that JMSXDeliveryCount optional property is not supported.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1563355 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 11 insertions, 9 deletions

diff --git a/qpid/doc/book/src/jms-client-0-8/JMS-Client-Examples.xml b/qpid/doc/book/src/jms-client-0-8/JMS-Client-Examples.xml
index d7dc481888..87abbb8bfb 100644
--- a/qpid/doc/book/src/jms-client-0-8/JMS-Client-Examples.xml
+++ b/qpid/doc/book/src/jms-client-0-8/JMS-Client-Examples.xml
@@ -226,7 +226,7 @@ public class StocksExample {
 
       Message message = session.createMessage();
       message.setStringProperty("instrument", "IBM");
-      message.setStringProperty("price", "100");
+      message.setIntProperty("price", 100);
       messageProducer.send(message);
       session.commit();
 
diff --git a/qpid/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml b/qpid/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml
index 4da75875a8..7113831f04 100644
--- a/qpid/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml
+++ b/qpid/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml
@@ -136,7 +136,7 @@ amqp://username:password@clientid/test
         </screen>
       </example>
       <para>For full details see <xref linkend="JMS-Client-0-8-Connection-URL"/></para>
-      <note>Note, that a single broker failover is enabled by default. If the failover behaviour is not desired it can be switched off
+      <note><para>Note, that a single broker failover is enabled by default. If the failover behaviour is not desired it can be switched off
        by setting a failover option to <emphasis>nofailover</emphasis> as in the example below
        <example>
         <title>Connection URL configured with nofailover</title>
@@ -145,7 +145,7 @@ amqp://username:password@clientid/test
             ?brokerlist='tcp://localhost:15672?failover='nofailover']]>
         </screen>
       </example>
-       </note>
+      </para></note>
       <!-- TODO perhaps mention ConnectionListener?-->
     </section>
     <section id="JMS-Client-0-8-Client-Understanding-Connection-Heartbeating">
@@ -284,7 +284,7 @@ amqp://guest:guest@clientid/?brokerlist='localhost:5671?trust_store='/path/to/ap
           >MessageConsumer#receive()</ulink> for Consumer B on the same Session, the application
         will hang indefinitely as even if messages suitable for B arrive at the Broker. Those
         messages can never be sent to the Session as no space is available in prefetch. </para>
-      <note>Please note, when the acknowlegement mode <emphasis>Session#SESSION_TRANSACTED</emphasis>
+      <note><para>Please note, when the acknowlegement mode <emphasis>Session#SESSION_TRANSACTED</emphasis>
        or <emphasis>Session#CLIENT_ACKNOWLEDGE</emphasis> is set on a consuming session,
        the prefetched messages are released from the prefetch buffer on transaction commit/rollback
        (in case of acknowledgement mode <emphasis>Session#SESSION_TRANSACTED</emphasis> )
@@ -294,7 +294,7 @@ amqp://guest:guest@clientid/?brokerlist='localhost:5671?trust_store='/path/to/ap
        the prefetched messages continue to remain in the prefetch buffer preventing the delivery of the following messages.
        As result, the application might stop the receiving of the messages
        until the transaction is committed/rolled back (for <emphasis>Session#SESSION_TRANSACTED</emphasis> )
-       or received messages are acknowledged (for <emphasis>Session#CLIENT_ACKNOWLEDGE</emphasis>).</note>
+        or received messages are acknowledged (for <emphasis>Session#CLIENT_ACKNOWLEDGE</emphasis>).</para></note>
     </section>
     <section id="JMS-Client-0-8-Client-Understanding-Session-TemporaryQueues">
       <title>TemporaryQueues</title>
@@ -379,10 +379,10 @@ amqp://guest:guest@clientid/?brokerlist='localhost:5671?trust_store='/path/to/ap
           linkend="JMS-Client-0-8-System-Properties-DefaultMandatoryTopic"
             ><literal>qpid.default_mandatory_topic</literal></link> for Queues and Topics
         respectively.</para>
-      <note>Please note, according to AMQP specifications the mandatory flag on a message tells the server
+      <note><para>Please note, according to AMQP specifications the mandatory flag on a message tells the server
        how to react if the message cannot be routed to a  queue. If this flag is set, the server will return an unroutable message with a
        Return method. If this flag is zero, the server silently drops the message. Please, refer <ulink url="&amqpSrc;">AMQP specifications</ulink>
-       for more details.</note>
+        for more details.</para></note>
     </section>
     <section id="JMS-Client-0-8-Client-Understanding-MessageProducer-CloseWhenNoRoute">
       <title>Close When No Route</title>
@@ -508,8 +508,10 @@ amqp://guest:guest@clientid/?brokerlist='localhost:5671?trust_store='/path/to/ap
         <literal>server</literal>.</para>
       <para>See <ulink
           url="&qpidJavaBrokerBook;Java-Broker-Runtime-Handling-Undeliverable-Messages.html#Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count"
-          > Unhandling Undeliverable Messages</ulink> within the Java Broker book for full details
-        of the functioning of this feature.</para>
+          > Handling Undeliverable Messages</ulink> within the Java Broker book for full details of
+          the functioning of this feature.</para>
+      <note><para>The optional JMS message header <literal>JMSXDeliveryCount</literal> is <emphasis>not</emphasis>
+          supported.</para></note>
     </section>
   </section>
   <section id="JMS-Client-0-8-Client-Understanding-Destinations">